From: Wim Taymans Date: Tue, 10 Jul 2012 12:38:21 +0000 (+0200) Subject: autodetect: proxy ts-offset properties X-Git-Tag: 1.19.3~509^2~6885 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab77c424be50782f3cba9b1f36659f6b66e06098;p=platform%2Fupstream%2Fgstreamer.git autodetect: proxy ts-offset properties Proxy the ts-offset property in the audio*sink elements. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=679343 --- diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 594f45a..bfb25a8 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -44,11 +44,14 @@ #include "gstautoaudiosink.h" #include "gstautodetect.h" +#define DEFAULT_TS_OFFSET 0 + /* Properties */ enum { PROP_0, PROP_CAPS, + PROP_TS_OFFSET, }; static GstStateChangeReturn @@ -100,6 +103,11 @@ gst_auto_audio_sink_class_init (GstAutoAudioSinkClass * klass) "Filter sink candidates using these caps.", GST_TYPE_CAPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_TS_OFFSET, + g_param_spec_int64 ("ts-offset", "TS Offset", + "Timestamp offset in nanoseconds", G_MININT64, G_MAXINT64, + DEFAULT_TS_OFFSET, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); @@ -166,6 +174,7 @@ gst_auto_audio_sink_init (GstAutoAudioSink * sink) /* set the default raw audio caps */ sink->filter_caps = gst_static_caps_get (&raw_caps); + sink->ts_offset = DEFAULT_TS_OFFSET; /* mark as sink */ GST_OBJECT_FLAG_SET (sink, GST_ELEMENT_FLAG_SINK); @@ -336,6 +345,8 @@ gst_auto_audio_sink_detect (GstAutoAudioSink * sink) if (!(esink = gst_auto_audio_sink_find_best (sink))) goto no_sink; + g_object_set (G_OBJECT (esink), "ts-offset", sink->ts_offset, NULL); + sink->kid = esink; /* Ensure the child is brought up to the right state to match the parent * although it's currently always in READY and @@ -415,6 +426,11 @@ gst_auto_audio_sink_set_property (GObject * object, guint prop_id, gst_caps_unref (sink->filter_caps); sink->filter_caps = gst_caps_copy (gst_value_get_caps (value)); break; + case PROP_TS_OFFSET: + sink->ts_offset = g_value_get_int64 (value); + if (sink->kid) + g_object_set_property (G_OBJECT (sink->kid), pspec->name, value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -432,6 +448,9 @@ gst_auto_audio_sink_get_property (GObject * object, guint prop_id, gst_value_set_caps (value, sink->filter_caps); break; } + case PROP_TS_OFFSET: + g_value_set_int64 (value, sink->ts_offset); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/gst/autodetect/gstautoaudiosink.h b/gst/autodetect/gstautoaudiosink.h index 2e5085f..40fae5c 100644 --- a/gst/autodetect/gstautoaudiosink.h +++ b/gst/autodetect/gstautoaudiosink.h @@ -44,6 +44,7 @@ typedef struct _GstAutoAudioSink { GstPad *pad; GstElement *kid; GstCaps *filter_caps; + GstClockTimeDiff ts_offset; } GstAutoAudioSink; typedef struct _GstAutoAudioSinkClass { diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c index 6c24c3b..272671a 100644 --- a/gst/autodetect/gstautovideosink.c +++ b/gst/autodetect/gstautovideosink.c @@ -44,11 +44,14 @@ #include "gstautovideosink.h" #include "gstautodetect.h" +#define DEFAULT_TS_OFFSET 0 + /* Properties */ enum { PROP_0, PROP_CAPS, + PROP_TS_OFFSET, }; static GstStateChangeReturn @@ -98,6 +101,11 @@ gst_auto_video_sink_class_init (GstAutoVideoSinkClass * klass) "Filter sink candidates using these caps.", GST_TYPE_CAPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_TS_OFFSET, + g_param_spec_int64 ("ts-offset", "TS Offset", + "Timestamp offset in nanoseconds", G_MININT64, G_MAXINT64, + DEFAULT_TS_OFFSET, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); gst_element_class_set_static_metadata (eklass, "Auto video sink", @@ -165,6 +173,7 @@ gst_auto_video_sink_init (GstAutoVideoSink * sink) /* set the default raw video caps */ sink->filter_caps = gst_static_caps_get (&raw_caps); + sink->ts_offset = DEFAULT_TS_OFFSET; /* mark as sink */ GST_OBJECT_FLAG_SET (sink, GST_ELEMENT_FLAG_SINK); @@ -332,6 +341,8 @@ gst_auto_video_sink_detect (GstAutoVideoSink * sink) if (!(esink = gst_auto_video_sink_find_best (sink))) goto no_sink; + g_object_set (G_OBJECT (esink), "ts-offset", sink->ts_offset, NULL); + sink->kid = esink; gst_bin_add (GST_BIN (sink), esink); @@ -403,6 +414,11 @@ gst_auto_video_sink_set_property (GObject * object, guint prop_id, gst_caps_unref (sink->filter_caps); sink->filter_caps = gst_caps_copy (gst_value_get_caps (value)); break; + case PROP_TS_OFFSET: + sink->ts_offset = g_value_get_int64 (value); + if (sink->kid) + g_object_set_property (G_OBJECT (sink->kid), pspec->name, value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -420,6 +436,9 @@ gst_auto_video_sink_get_property (GObject * object, guint prop_id, gst_value_set_caps (value, sink->filter_caps); break; } + case PROP_TS_OFFSET: + g_value_set_int64 (value, sink->ts_offset); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/gst/autodetect/gstautovideosink.h b/gst/autodetect/gstautovideosink.h index 9aece2b..1ec4a26 100644 --- a/gst/autodetect/gstautovideosink.h +++ b/gst/autodetect/gstautovideosink.h @@ -44,6 +44,7 @@ typedef struct _GstAutoVideoSink { GstPad *pad; GstElement *kid; GstCaps *filter_caps; + GstClockTimeDiff ts_offset; } GstAutoVideoSink; typedef struct _GstAutoVideoSinkClass {