From 52e4a20b4e9bfbe92390dcbb69cf124d2564f91e Mon Sep 17 00:00:00 2001 From: Yeongjin Jeong Date: Tue, 22 Jan 2019 01:54:24 +0900 Subject: [PATCH] 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 --- ext/fdkaac/gstfdkaacdec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c index a5d20a3124..ea5588a33f 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);