]>
Commit | Line | Data |
---|---|---|
4271fa72 JB |
1 | --- gst-plugins-bad-1.14.4/ext/fdkaac/gstfdkaacenc.c.orig 2018-03-23 21:45:15.000000000 +0100 |
2 | +++ gst-plugins-bad-1.14.4/ext/fdkaac/gstfdkaacenc.c 2019-04-23 21:09:29.487183501 +0200 | |
3 | @@ -71,10 +71,6 @@ | |
4 | GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, | |
5 | GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, | |
6 | GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, { | |
7 | - 3, MODE_2_1, { | |
8 | - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, | |
9 | - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, | |
10 | - GST_AUDIO_CHANNEL_POSITION_LFE1}}, { | |
11 | 4, MODE_1_2_1, { | |
12 | GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, | |
13 | GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, | |
14 | --- gst-plugins-bad-1.14.4/ext/fdkaac/gstfdkaacdec.c.orig 2018-03-23 21:45:15.000000000 +0100 | |
15 | +++ gst-plugins-bad-1.14.4/ext/fdkaac/gstfdkaacdec.c 2019-04-23 21:21:00.353440757 +0200 | |
16 | @@ -151,17 +151,13 @@ | |
17 | gst_buffer_unref (codec_data); | |
18 | } | |
19 | ||
20 | + /* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0 | |
21 | + * The pChannelIndices retain the indices from the standard MPEG mapping so | |
22 | + * we're agnostic to the actual order. */ | |
23 | if ((err = | |
24 | aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING, | |
25 | - 0)) != AAC_DEC_OK) { | |
26 | - GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err); | |
27 | - return FALSE; | |
28 | - } | |
29 | - | |
30 | - if ((err = | |
31 | - aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED, | |
32 | 1)) != AAC_DEC_OK) { | |
33 | - GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err); | |
34 | + GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err); | |
35 | return FALSE; | |
36 | } | |
37 |