audioparse: add a mode where the caps are taken from the sink pad, and thus audioparse

is only performing timestamping.

diff --git a/gst/rawparse/gstaudioparse.c b/gst/rawparse/gstaudioparse.c
index 58bfe75ec6a66a783f7c3aff9ce1d98ada6f781a..696fa96265889c6deb3fb5ec9c092fe7194451e8 100644 (file)
--- a/gst/rawparse/gstaudioparse.c
+++ b/gst/rawparse/gstaudioparse.c
@@ -70,7 +70,8 @@ enum
   PROP_RATE,
   PROP_CHANNELS,
   PROP_INTERLEAVED,
-  PROP_CHANNEL_POSITIONS
+  PROP_CHANNEL_POSITIONS,
+  PROP_USE_SINK_CAPS
 };
 
 #define GST_AUDIO_PARSE_FORMAT (gst_audio_parse_format_get_type ())
@@ -146,6 +147,11 @@ gst_audio_parse_class_init (GstAudioParseClass * klass)
               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS),
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  g_object_class_install_property (gobject_class, PROP_USE_SINK_CAPS,
+      g_param_spec_boolean ("use-sink-caps", "Use sink caps",
+          "Use the sink caps for the format, only performing timestamping",
+          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   gst_element_class_set_metadata (gstelement_class, "Audio Parse",
       "Filter/Audio",
       "Converts stream into audio frames",
@@ -206,6 +212,9 @@ gst_audio_parse_set_property (GObject * object, guint prop_id,
 
       ap->channel_positions = g_value_dup_boxed (value);
       break;
+    case PROP_USE_SINK_CAPS:
+      ap->use_sink_caps = g_value_get_boolean (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -243,6 +252,9 @@ gst_audio_parse_get_property (GObject * object, guint prop_id, GValue * value,
     case PROP_CHANNEL_POSITIONS:
       g_value_set_boxed (value, ap->channel_positions);
       break;
+    case PROP_USE_SINK_CAPS:
+      g_value_set_boolean (value, ap->use_sink_caps);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -356,6 +368,17 @@ gst_audio_parse_get_caps (GstRawParse * rp)
   gint fps_n, fps_d;
   const GValue *val;
 
+  if (ap->use_sink_caps) {
+    gint rate;
+    GstCaps *caps = gst_pad_get_current_caps (rp->sinkpad);
+    gst_audio_info_from_caps (&info, caps);
+
+    rate = GST_AUDIO_INFO_RATE (&info);
+    gst_raw_parse_set_fps (GST_RAW_PARSE (ap), rate, 1);
+
+    return caps;
+  }
+
   gst_raw_parse_get_fps (rp, &fps_n, &fps_d);
   gst_audio_parse_setup_channel_positions (ap);
 

diff --git a/gst/rawparse/gstaudioparse.h b/gst/rawparse/gstaudioparse.h
index d8dff783e8ff0d5ddff00650fb49e65505af1c27..8252fe3cd4ada3ed716081aa8ee9611748347877 100644 (file)
--- a/gst/rawparse/gstaudioparse.h
+++ b/gst/rawparse/gstaudioparse.h
@@ -48,6 +48,7 @@ struct _GstAudioParse
   GstRawParse parent;
 
   /* properties */
+  gboolean use_sink_caps;
   gint format;
   GstAudioFormat raw_format;
   gint channels;