From 715b44ea66be964a216f409bf8a7f11a1a3128b8 Mon Sep 17 00:00:00 2001 From: jitendra Date: Mon, 6 May 2013 19:03:59 +0530 Subject: [PATCH] omx: Add pads based on element type This allows to later add sources and sink that only have a srcpad or sinkpad. https://bugzilla.gnome.org/show_bug.cgi?id=699754 --- omx/gstomx.c | 73 ++++++++++++++++++++++++++++------------------------ omx/gstomx.h | 8 ++++++ omx/gstomxaudioenc.c | 1 + omx/gstomxvideodec.c | 1 + omx/gstomxvideoenc.c | 1 + 5 files changed, 50 insertions(+), 34 deletions(-) diff --git a/omx/gstomx.c b/omx/gstomx.c index a6c33bb..4a81de9 100644 --- a/omx/gstomx.c +++ b/omx/gstomx.c @@ -2616,52 +2616,57 @@ _class_init (gpointer g_class, gpointer data) /* Add pad templates */ err = NULL; - if (!(template_caps = - g_key_file_get_string (config, element_name, "sink-template-caps", - &err))) { - GST_DEBUG - ("No sink template caps specified for element '%s', using default '%s'", - element_name, class_data->default_sink_template_caps); - caps = gst_caps_from_string (class_data->default_sink_template_caps); - g_assert (caps != NULL); - g_error_free (err); - } else { - caps = gst_caps_from_string (template_caps); - if (!caps) { + if (class_data->type != GST_OMX_COMPONENT_TYPE_SOURCE) { + if (!(template_caps = + g_key_file_get_string (config, element_name, "sink-template-caps", + &err))) { GST_DEBUG - ("Could not parse sink template caps '%s' for element '%s', using default '%s'", - template_caps, element_name, class_data->default_sink_template_caps); + ("No sink template caps specified for element '%s', using default '%s'", + element_name, class_data->default_sink_template_caps); caps = gst_caps_from_string (class_data->default_sink_template_caps); g_assert (caps != NULL); + g_error_free (err); + } else { + caps = gst_caps_from_string (template_caps); + if (!caps) { + GST_DEBUG + ("Could not parse sink template caps '%s' for element '%s', using default '%s'", + template_caps, element_name, + class_data->default_sink_template_caps); + caps = gst_caps_from_string (class_data->default_sink_template_caps); + g_assert (caps != NULL); + } } + templ = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps); + g_free (template_caps); + gst_element_class_add_pad_template (element_class, templ); } - templ = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps); - g_free (template_caps); - gst_element_class_add_pad_template (element_class, templ); err = NULL; - if (!(template_caps = - g_key_file_get_string (config, element_name, "src-template-caps", - &err))) { - GST_DEBUG - ("No src template caps specified for element '%s', using default '%s'", - element_name, class_data->default_src_template_caps); - caps = gst_caps_from_string (class_data->default_src_template_caps); - g_assert (caps != NULL); - g_error_free (err); - } else { - caps = gst_caps_from_string (template_caps); - if (!caps) { + if (class_data->type != GST_OMX_COMPONENT_TYPE_SINK) { + if (!(template_caps = + g_key_file_get_string (config, element_name, "src-template-caps", + &err))) { GST_DEBUG - ("Could not parse src template caps '%s' for element '%s', using default '%s'", - template_caps, element_name, class_data->default_src_template_caps); + ("No src template caps specified for element '%s', using default '%s'", + element_name, class_data->default_src_template_caps); caps = gst_caps_from_string (class_data->default_src_template_caps); g_assert (caps != NULL); + g_error_free (err); + } else { + caps = gst_caps_from_string (template_caps); + if (!caps) { + GST_DEBUG + ("Could not parse src template caps '%s' for element '%s', using default '%s'", + template_caps, element_name, class_data->default_src_template_caps); + caps = gst_caps_from_string (class_data->default_src_template_caps); + g_assert (caps != NULL); + } } + templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps); + g_free (template_caps); + gst_element_class_add_pad_template (element_class, templ); } - templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps); - g_free (template_caps); - gst_element_class_add_pad_template (element_class, templ); if ((hacks = g_key_file_get_string_list (config, element_name, "hacks", NULL, diff --git a/omx/gstomx.h b/omx/gstomx.h index 3afcbdb..8af81b8 100644 --- a/omx/gstomx.h +++ b/omx/gstomx.h @@ -156,6 +156,12 @@ typedef enum { GST_OMX_MESSAGE_BUFFER_DONE, } GstOMXMessageType; +typedef enum { + GST_OMX_COMPONENT_TYPE_SINK, + GST_OMX_COMPONENT_TYPE_SOURCE, + GST_OMX_COMPONENT_TYPE_FILTER +} GstOmxComponentType; + struct _GstOMXMessage { GstOMXMessageType type; @@ -272,6 +278,8 @@ struct _GstOMXClassData { guint32 in_port_index, out_port_index; guint64 hacks; + + GstOmxComponentType type; }; GKeyFile * gst_omx_get_configuration (void); diff --git a/omx/gstomxaudioenc.c b/omx/gstomxaudioenc.c index 36cf6a8..2a8a090 100644 --- a/omx/gstomxaudioenc.c +++ b/omx/gstomxaudioenc.c @@ -85,6 +85,7 @@ gst_omx_audio_enc_class_init (GstOMXAudioEncClass * klass) audio_encoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_sink_event); + klass->cdata.type = GST_OMX_COMPONENT_TYPE_FILTER; klass->cdata.default_sink_template_caps = "audio/x-raw, " "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, " G_STRINGIFY (OMX_AUDIO_MAXCHANNELS) " ], " diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c index 1d3f395..09f1825 100644 --- a/omx/gstomxvideodec.c +++ b/omx/gstomxvideodec.c @@ -727,6 +727,7 @@ gst_omx_video_dec_class_init (GstOMXVideoDecClass * klass) video_decoder_class->decide_allocation = GST_DEBUG_FUNCPTR (gst_omx_video_dec_decide_allocation); + klass->cdata.type = GST_OMX_COMPONENT_TYPE_FILTER; klass->cdata.default_src_template_caps = "video/x-raw, " "width = " GST_VIDEO_SIZE_RANGE ", " "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE; diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c index 15a9d51..4506992 100644 --- a/omx/gstomxvideoenc.c +++ b/omx/gstomxvideoenc.c @@ -192,6 +192,7 @@ gst_omx_video_enc_class_init (GstOMXVideoEncClass * klass) GST_DEBUG_FUNCPTR (gst_omx_video_enc_propose_allocation); video_encoder_class->getcaps = GST_DEBUG_FUNCPTR (gst_omx_video_enc_getcaps); + klass->cdata.type = GST_OMX_COMPONENT_TYPE_FILTER; klass->cdata.default_sink_template_caps = "video/x-raw, " "width = " GST_VIDEO_SIZE_RANGE ", " "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE; -- 2.7.4