diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-12-04 17:57:15 +0100 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2018-12-17 12:39:13 +0000 |
| commit | 383fe6f81dafd538a8a34ce279953254225835d3 (patch) | |
| tree | 74af1f4bba9eae73e3f1550ec0c5310ea13292f9 | |
| parent | d3f174f77f25c66f14d2036a80e334a95c081691 (diff) | |
| download | gstreamer-plugins-bad-383fe6f81dafd538a8a34ce279953254225835d3.tar.gz | |
fdkaacenc: Prefer REAR for surround channels
We (currently?) prefer to use the REAR positions for what MPEG calls
"surround" channels.
| -rw-r--r-- | ext/fdkaac/gstfdkaacenc.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c index 8410e684c..8700caea7 100644 --- a/ext/fdkaac/gstfdkaacenc.c +++ b/ext/fdkaac/gstfdkaacenc.c @@ -77,37 +77,41 @@ static const struct GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}}, { 5, MODE_1_2_2, { - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + 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}}, { + /* FIXME: SURROUND instead of REAR is more to spec */ + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}}, { 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_RIGHT, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + /* FIXME: SURROUND instead of REAR is more to spec */ + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, GST_AUDIO_CHANNEL_POSITION_LFE1}} #ifdef HAVE_FDK_AAC_0_1_4 , { 8, MODE_7_1_REAR_SURROUND, { - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + /* FIXME: SURROUND instead of SIDE is more to spec */ + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, 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_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_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + /* FIXME: SURROUND instead of REAR is more to spec */ + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, GST_AUDIO_CHANNEL_POSITION_LFE1}} #endif }; |