Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-12 23:09:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gstreamer: Replace NULL with nullptr

Browse source 
Usage of NULL has slowly crept in the libcamerasrc sources. Replace it
with nullptr.

Reported-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
This commit is contained in:
Laurent Pinchart 2025-06-04 04:17:10 +03:00
parent a8f90517e0
commit b3ff75d758
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gstreamer/gstlibcamera-controls.cpp.in
View file

@ -68,7 +68,7 @@ static const GEnumValue {{ ctrl.name|snake_case }}_types[] = {
"{{ enum.gst_name }}" "{{ enum.gst_name }}"
}, },
{%- endfor %} {%- endfor %}
{0, NULL, NULL} {0, nullptr, nullptr}
}; };
#define TYPE_{{ ctrl.name|snake_case|upper }} \ #define TYPE_{{ ctrl.name|snake_case|upper }} \

2
src/gstreamer/gstlibcamerapad.cpp
View file

@ -102,7 +102,7 @@ gst_libcamera_stream_role_get_type()
"libcamera::Viewfinder", "libcamera::Viewfinder",
"view-finder", "view-finder",
}, },
{ 0, NULL, NULL } { 0, nullptr, nullptr }
}; };
if (!type) if (!type)

23
src/gstreamer/gstlibcamerasrc.cpp
View file

@ -368,10 +368,10 @@ int GstLibcameraSrcState::processRequest()
if (video_pool) { if (video_pool) {
/* Only set video pool when a copy is needed. */ /* Only set video pool when a copy is needed. */
GstBuffer *copy = NULL; GstBuffer *copy = nullptr;
const GstVideoInfo info = gst_libcamera_pad_get_video_info(srcpad); const GstVideoInfo info = gst_libcamera_pad_get_video_info(srcpad);
ret = gst_buffer_pool_acquire_buffer(video_pool, &copy, NULL); ret = gst_buffer_pool_acquire_buffer(video_pool, &copy, nullptr);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
gst_buffer_unref(buffer); gst_buffer_unref(buffer);
GST_ELEMENT_ERROR(src_, RESOURCE, SETTINGS, GST_ELEMENT_ERROR(src_, RESOURCE, SETTINGS,
@ -541,8 +541,8 @@ static std::tuple<GstBufferPool *, int>
gst_libcamera_create_video_pool(GstLibcameraSrc *self, GstPad *srcpad, gst_libcamera_create_video_pool(GstLibcameraSrc *self, GstPad *srcpad,
GstCaps *caps, const GstVideoInfo *info) GstCaps *caps, const GstVideoInfo *info)
{ {
g_autoptr(GstQuery) query = NULL; g_autoptr(GstQuery) query = nullptr;
g_autoptr(GstBufferPool) pool = NULL; g_autoptr(GstBufferPool) pool = nullptr;
const gboolean need_pool = true; const gboolean need_pool = true;
/* /*
@ -554,8 +554,8 @@ gst_libcamera_create_video_pool(GstLibcameraSrc *self, GstPad *srcpad,
if (!gst_pad_peer_query(srcpad, query)) if (!gst_pad_peer_query(srcpad, query))
GST_DEBUG_OBJECT(self, "Didn't get downstream ALLOCATION hints"); GST_DEBUG_OBJECT(self, "Didn't get downstream ALLOCATION hints");
else if (gst_query_find_allocation_meta(query, GST_VIDEO_META_API_TYPE, NULL)) else if (gst_query_find_allocation_meta(query, GST_VIDEO_META_API_TYPE, nullptr))
return { NULL, 0 }; return { nullptr, 0 };
GST_WARNING_OBJECT(self, "Downstream doesn't support video meta, need to copy frame."); GST_WARNING_OBJECT(self, "Downstream doesn't support video meta, need to copy frame.");
@ -564,7 +564,8 @@ gst_libcamera_create_video_pool(GstLibcameraSrc *self, GstPad *srcpad,
* create a new pool. * create a new pool.
*/ */
if (gst_query_get_n_allocation_pools(query) > 0) if (gst_query_get_n_allocation_pools(query) > 0)
gst_query_parse_nth_allocation_pool(query, 0, &pool, NULL, NULL, NULL); gst_query_parse_nth_allocation_pool(query, 0, &pool, nullptr,
nullptr, nullptr);
if (!pool) { if (!pool) {
GstStructure *config; GstStructure *config;
@ -583,7 +584,7 @@ gst_libcamera_create_video_pool(GstLibcameraSrc *self, GstPad *srcpad,
GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS, GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,
("Failed to active buffer pool"), ("Failed to active buffer pool"),
("gst_libcamera_src_negotiate() failed.")); ("gst_libcamera_src_negotiate() failed."));
return { NULL, -EINVAL }; return { nullptr, -EINVAL };
} }
return { std::exchange(pool, nullptr), 0 }; return { std::exchange(pool, nullptr), 0 };
@ -660,7 +661,7 @@ gst_libcamera_src_negotiate(GstLibcameraSrc *self)
for (gsize i = 0; i < state->srcpads_.size(); i++) { for (gsize i = 0; i < state->srcpads_.size(); i++) {
GstPad *srcpad = state->srcpads_[i]; GstPad *srcpad = state->srcpads_[i];
const StreamConfiguration &stream_cfg = state->config_->at(i); const StreamConfiguration &stream_cfg = state->config_->at(i);
GstBufferPool *video_pool = NULL; GstBufferPool *video_pool = nullptr;
GstVideoInfo info; GstVideoInfo info;
g_autoptr(GstCaps) caps = gst_libcamera_stream_configuration_to_caps(stream_cfg, transfer[i]); g_autoptr(GstCaps) caps = gst_libcamera_stream_configuration_to_caps(stream_cfg, transfer[i]);
@ -1065,7 +1066,7 @@ gst_libcamera_src_request_new_pad(GstElement *element, GstPadTemplate *templ,
const gchar *name, [[maybe_unused]] const GstCaps *caps) const gchar *name, [[maybe_unused]] const GstCaps *caps)
{ {
GstLibcameraSrc *self = GST_LIBCAMERA_SRC(element); GstLibcameraSrc *self = GST_LIBCAMERA_SRC(element);
g_autoptr(GstPad) pad = NULL; g_autoptr(GstPad) pad = nullptr;
GST_DEBUG_OBJECT(self, "new request pad created"); GST_DEBUG_OBJECT(self, "new request pad created");
@ -1079,7 +1080,7 @@ gst_libcamera_src_request_new_pad(GstElement *element, GstPadTemplate *templ,
GST_ELEMENT_ERROR(element, STREAM, FAILED, GST_ELEMENT_ERROR(element, STREAM, FAILED,
("Internal data stream error."), ("Internal data stream error."),
("Could not add pad to element")); ("Could not add pad to element"));
return NULL; return nullptr;
} }
gst_child_proxy_child_added(GST_CHILD_PROXY(self), G_OBJECT(pad), GST_OBJECT_NAME(pad)); gst_child_proxy_child_added(GST_CHILD_PROXY(self), G_OBJECT(pad), GST_OBJECT_NAME(pad));