mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

uvch264: Remove the _ from the element names

Browse source 
Rename uvch264_src to uvch264src and uvch264_mjpgdemux to
uvch264mjpgdemux
This commit is contained in:
Sjoerd Simons 2013-01-18 23:23:56 +01:00 committed by Sjoerd Simons
parent 0de5ad65f0
commit 6ce751442b
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/uvch264/gstuvch264.c
View file

@ -32,11 +32,11 @@
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
if (!gst_element_register (plugin, "uvch264_mjpgdemux", GST_RANK_NONE, if (!gst_element_register (plugin, "uvch264mjpgdemux", GST_RANK_NONE,
GST_TYPE_UVC_H264_MJPG_DEMUX)) GST_TYPE_UVC_H264_MJPG_DEMUX))
return FALSE; return FALSE;
if (!gst_element_register (plugin, "uvch264_src", GST_RANK_NONE, if (!gst_element_register (plugin, "uvch264src", GST_RANK_NONE,
GST_TYPE_UVC_H264_SRC)) GST_TYPE_UVC_H264_SRC))
return FALSE; return FALSE;

4
sys/uvch264/gstuvch264_mjpgdemux.c
View file

@ -22,7 +22,7 @@
*/ */
/** /**
* SECTION:element-uvch264-mjpgdemux * SECTION:element-uvch264mjpgdemux
* @short_description: UVC H264 compliant MJPG demuxer * @short_description: UVC H264 compliant MJPG demuxer
* *
* Parses a MJPG stream from a UVC H264 compliant encoding camera and extracts * Parses a MJPG stream from a UVC H264 compliant encoding camera and extracts
@ -221,7 +221,7 @@ gst_uvc_h264_mjpg_demux_class_init (GstUvcH264MjpgDemuxClass * klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
GST_DEBUG_CATEGORY_INIT (uvc_h264_mjpg_demux_debug, GST_DEBUG_CATEGORY_INIT (uvc_h264_mjpg_demux_debug,
"uvch264_mjpgdemux", 0, "UVC H264 MJPG Demuxer"); "uvch264mjpgdemux", 0, "UVC H264 MJPG Demuxer");
} }
static void static void

8
sys/uvch264/gstuvch264_src.c
View file

@ -265,7 +265,7 @@ gst_uvc_h264_src_class_init (GstUvcH264SrcClass * klass)
gstbasecamerasrc_class->start_capture = gst_uvc_h264_src_start_capture; gstbasecamerasrc_class->start_capture = gst_uvc_h264_src_start_capture;
gstbasecamerasrc_class->stop_capture = gst_uvc_h264_src_stop_capture; gstbasecamerasrc_class->stop_capture = gst_uvc_h264_src_stop_capture;
GST_DEBUG_CATEGORY_INIT (uvc_h264_src_debug, "uvch264_src", GST_DEBUG_CATEGORY_INIT (uvc_h264_src_debug, "uvch264src",
0, "UVC H264 Compliant camera bin source"); 0, "UVC H264 Compliant camera bin source");
gst_element_class_set_static_metadata (gstelement_class, gst_element_class_set_static_metadata (gstelement_class,
@ -2753,7 +2753,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
break; break;
case H264_JPG: case H264_JPG:
GST_DEBUG_OBJECT (self, "H264+JPG"); GST_DEBUG_OBJECT (self, "H264+JPG");
self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL); self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
if (!self->mjpg_demux || !gst_bin_add (GST_BIN (self), self->mjpg_demux)) if (!self->mjpg_demux || !gst_bin_add (GST_BIN (self), self->mjpg_demux))
goto error_remove; goto error_remove;
gst_object_ref (self->mjpg_demux); gst_object_ref (self->mjpg_demux);
@ -2767,7 +2767,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
break; break;
case H264_RAW: case H264_RAW:
GST_DEBUG_OBJECT (self, "H264+Raw"); GST_DEBUG_OBJECT (self, "H264+Raw");
self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL); self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
self->vf_colorspace = gst_element_factory_make (self->colorspace_name, self->vf_colorspace = gst_element_factory_make (self->colorspace_name,
NULL); NULL);
if (!self->mjpg_demux || !self->vf_colorspace) if (!self->mjpg_demux || !self->vf_colorspace)
@ -2794,7 +2794,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
break; break;
case H264_JPG2RAW: case H264_JPG2RAW:
GST_DEBUG_OBJECT (self, "H264+Raw(jpegdec)"); GST_DEBUG_OBJECT (self, "H264+Raw(jpegdec)");
self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL); self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
self->jpeg_dec = gst_element_factory_make (self->jpeg_decoder_name, NULL); self->jpeg_dec = gst_element_factory_make (self->jpeg_decoder_name, NULL);
self->vf_colorspace = gst_element_factory_make (self->colorspace_name, self->vf_colorspace = gst_element_factory_make (self->colorspace_name,
NULL); NULL);

2
tests/check/elements/uvch264demux.c
View file

@ -148,7 +148,7 @@ _setup_test (gboolean link_h264, gboolean link_yuy2, gboolean link_nv12,
have_h264_eos = have_yuy2_eos = have_nv12_eos = have_jpg_eos = FALSE; have_h264_eos = have_yuy2_eos = have_nv12_eos = have_jpg_eos = FALSE;
buffer_h264 = buffer_yuy2 = buffer_nv12 = buffer_jpg = NULL; buffer_h264 = buffer_yuy2 = buffer_nv12 = buffer_jpg = NULL;
demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL); demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
fail_unless (demux != NULL); fail_unless (demux != NULL);
gst_element_set_bus (demux, bus); gst_element_set_bus (demux, bus);

2
tests/examples/uvch264/test-uvch264.c
View file

@ -530,7 +530,7 @@ main (int argc, char *argv[])
argv[0], device); argv[0], device);
self.bin = gst_parse_launch ("uvch264_src name=src src.vidsrc ! queue ! " self.bin = gst_parse_launch ("uvch264src name=src src.vidsrc ! queue ! "
"capsfilter name=vid_cf ! identity name=identity ! decodebin ! " "capsfilter name=vid_cf ! identity name=identity ! decodebin ! "
"xvimagesink name=h264_sink async=false " "xvimagesink name=h264_sink async=false "
"src.vfsrc ! queue ! capsfilter name=vf_cf ! " "src.vfsrc ! queue ! capsfilter name=vf_cf ! "

2
tests/examples/uvch264/window.glade
View file

@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window"> <object class="GtkWindow" id="window">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Test for uvch264_src</property> <property name="title" translatable="yes">Test for uvch264src</property>
<signal name="destroy" handler="on_window_destroyed" swapped="no"/> <signal name="destroy" handler="on_window_destroyed" swapped="no"/>
<child> <child>
<object class="GtkHBox" id="hbox1"> <object class="GtkHBox" id="hbox1">