mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

fdkaacdec: Fix build for fdkaac < 0.1.4

Browse source 
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
This commit is contained in:
Yeongjin Jeong 2019-01-22 01:54:24 +09:00 committed by Olivier Crête
parent 546797cecf
commit 52e4a20b4e
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/fdkaac/gstfdkaacdec.c
View file

@ -32,12 +32,19 @@
* - Error concealment * - 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", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/mpeg, " GST_STATIC_CAPS ("audio/mpeg, "
"mpegversion = (int) 4, " "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", 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, " GST_STATIC_CAPS ("audio/x-raw, "
"format = (string) " GST_AUDIO_NE (S16) ", " "format = (string) " GST_AUDIO_NE (S16) ", "
"layout = (string) interleaved, " "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); GST_DEBUG_CATEGORY_STATIC (gst_fdkaacdec_debug);