diff options
| author | Yeongjin Jeong <yeongjin.jeong@navercorp.com> | 2019-01-22 01:54:24 +0900 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2019-01-25 15:50:31 -0500 |
| commit | 52e4a20b4e9bfbe92390dcbb69cf124d2564f91e (patch) | |
| tree | a4fdb2b462f7870109a0b6e0877110a6b8c5fcd9 /ext/fdkaac | |
| parent | 546797cecfe8ca67bbef6de39b84e6410293b42b (diff) | |
| download | gstreamer-plugins-bad-52e4a20b4e9bfbe92390dcbb69cf124d2564f91e.tar.gz | |
fdkaacdec: Fix build for fdkaac < 0.1.4
The fdkaac decoder supports 6.1 / 7.1 channels with downmixer
since v0.1.4. Old versions can use AAC_PCM_OUTPUT_CHANNELS
instead of AAC_PCM_MAX_OUTPUT_CHANNELS.
Fixes #873
Diffstat (limited to 'ext/fdkaac')
| -rw-r--r-- | ext/fdkaac/gstfdkaacdec.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c index a5d20a312..ea5588a33 100644 --- a/ext/fdkaac/gstfdkaacdec.c +++ b/ext/fdkaac/gstfdkaacdec.c @@ -32,12 +32,19 @@ * - Error concealment */ +#ifndef HAVE_FDK_AAC_0_1_4 +#define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS +#define CHANNELS_CAPS_STR "channels = (int) [1, 6]" +#else +#define CHANNELS_CAPS_STR "channels = (int) [1, 8]" +#endif + static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 4, " - "stream-format = (string) { adts, adif, raw }") + "stream-format = (string) { adts, adif, raw }, " CHANNELS_CAPS_STR) ); static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", @@ -46,7 +53,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("audio/x-raw, " "format = (string) " GST_AUDIO_NE (S16) ", " "layout = (string) interleaved, " - "rate = (int) [8000, 96000], " "channels = (int) [1, 8]") + "rate = (int) [8000, 96000], " CHANNELS_CAPS_STR) ); GST_DEBUG_CATEGORY_STATIC (gst_fdkaacdec_debug); |