| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 1 | From aadfa5f20f53601785e417fe3fcbe6d574880988 Mon Sep 17 00:00:00 2001 |
| 2 | From: Philippe Normand <philn@igalia.com> |
| 3 | Date: Tue, 23 Apr 2019 10:10:01 +0100 |
| 4 | Subject: [PATCH] scaletempo: Advertise interleaved layout in caps templates |
| 5 | |
| 6 | Scaletempo doesn't support non-interleaved layout. Not explicitely stating this |
| 7 | would trigger critical warnings and a caps negotiation failure when scaletempo |
| 8 | is used as playbin audio-filter. |
| 9 | |
| 10 | Patch suggested by George Kiagiadakis <george.kiagiadakis@collabora.com>. |
| 11 | |
| 12 | Fixes #591 |
| 13 | Upstream-Status: Backport [merged, on track for 1.16.1.] |
| 14 | --- |
| 15 | gst/audiofx/gstscaletempo.c | 6 +++--- |
| 16 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 17 | |
| 18 | diff --git a/gst/audiofx/gstscaletempo.c b/gst/audiofx/gstscaletempo.c |
| 19 | index 3a719719a..83ee8fe24 100644 |
| 20 | --- a/gst/audiofx/gstscaletempo.c |
| 21 | +++ b/gst/audiofx/gstscaletempo.c |
| 22 | @@ -93,9 +93,9 @@ enum |
| 23 | |
| 24 | #define SUPPORTED_CAPS \ |
| 25 | GST_STATIC_CAPS ( \ |
| 26 | - GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) "; " \ |
| 27 | - GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) "; " \ |
| 28 | - GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) \ |
| 29 | + GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) ", layout=(string)interleaved; " \ |
| 30 | + GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) ", layout=(string)interleaved; " \ |
| 31 | + GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) ", layout=(string)interleaved" \ |
| 32 | ) |
| 33 | |
| 34 | static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", |
| 35 | -- |
| 36 | 2.20.1 |
| 37 | |