mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-17 22:06:41 +00:00
fdkaacenc: Add missing SURROUND mappings
SURROUND is more to spec according to the FIXME comments, so add this. Also add SIDE for 5 and 5.1 because of ffmpeg compatibility, because the following pipeline downmixes to mono otherwise: gst-launch-1.0 audiotestsrc num-buffers=1 ! audio/x-raw, channels=6 ! avenc_ac3 ! avdec_ac3 ! audioconvert ! fdkaacenc ! fakesink -v Fixes #1327 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1352>
This commit is contained in:
Vivia Nikolaidou
Sebastian Dröge
parent
c21aefbfb0
commit
41950f2aba
1 changed files with 106 additions and 28 deletions
|
|
@ -55,6 +55,7 @@ enum
|
||||||
"88200, " \
|
"88200, " \
|
||||||
"96000"
|
"96000"
|
||||||
|
|
||||||
|
/* *INDENT-OFF* */
|
||||||
static const struct
|
static const struct
|
||||||
{
|
{
|
||||||
gint channels;
|
gint channels;
|
||||||
|
|
@ -85,18 +86,47 @@ static const struct
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of REAR is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}}, {
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}}, {
|
||||||
|
5, MODE_1_2_2, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT}}, {
|
||||||
|
/* MPEG 5: 5.0 Surround with SIDE (ffmpeg produces this) */
|
||||||
|
5, MODE_1_2_2, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}}, {
|
||||||
/* MPEG 6: 5.1 Surround */
|
/* MPEG 6: 5.1 Surround */
|
||||||
6, MODE_1_2_2_1, {
|
6, MODE_1_2_2_1, {
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of REAR is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
6, MODE_1_2_2_1, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
/* MPEG 6: 5.1 Surround with SIDE (ffmpeg produces this) */
|
||||||
|
6, MODE_1_2_2_1, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
/* Note: 8-channel layouts might also have informal variants with
|
||||||
|
* SIDE instead of SURROUND, but they are more complicated. They
|
||||||
|
* can be added here if the need arises */
|
||||||
/* MPEG 7: SDDS for cinema */
|
/* MPEG 7: SDDS for cinema */
|
||||||
8, MODE_1_2_2_2_1, {
|
8, MODE_1_2_2_2_1, {
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
|
@ -104,9 +134,17 @@ static const struct
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of REAR is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
8, MODE_1_2_2_2_1, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_LFE1}}
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}
|
||||||
#ifdef HAVE_FDK_AAC_2_0_0
|
#ifdef HAVE_FDK_AAC_2_0_0
|
||||||
, {
|
, {
|
||||||
|
|
@ -115,32 +153,55 @@ static const struct
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of REAR is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
7, MODE_6_1, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
/* MPEG 12: 7.1 Surround */
|
/* MPEG 12: 7.1 Surround */
|
||||||
8, MODE_7_1_BACK, {
|
8, MODE_7_1_BACK, {
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of SIDE is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
8, MODE_7_1_BACK, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
/* MPEG 14: 5.1.2 Surround */
|
/* MPEG 14: 5.1.2 Surround */
|
||||||
8, MODE_7_1_TOP_FRONT, {
|
8, MODE_7_1_TOP_FRONT, {
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of REAR is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_LFE1,
|
GST_AUDIO_CHANNEL_POSITION_LFE1,
|
||||||
GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}}, {
|
||||||
|
8, MODE_7_1_TOP_FRONT, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}}
|
GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}}
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_FDK_AAC_0_1_4
|
#ifdef HAVE_FDK_AAC_0_1_4
|
||||||
|
|
@ -150,12 +211,20 @@ static const struct
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of SIDE is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
8, MODE_7_1_REAR_SURROUND, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
/* Non-standard PCE clone of mode 7 */
|
/* Non-standard PCE clone of mode 7 */
|
||||||
8, MODE_7_1_FRONT_CENTER, {
|
8, MODE_7_1_FRONT_CENTER, {
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
|
@ -163,12 +232,21 @@ static const struct
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
/* FIXME: SURROUND instead of REAR is more to spec */
|
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||||
|
8, MODE_7_1_FRONT_CENTER, {
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
|
||||||
|
GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
|
||||||
GST_AUDIO_CHANNEL_POSITION_LFE1}}
|
GST_AUDIO_CHANNEL_POSITION_LFE1}}
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
/* *INDENT-ON* */
|
||||||
|
|
||||||
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
|
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||||
GST_PAD_SINK,
|
GST_PAD_SINK,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue