Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Codecs: mp4: Support object type 29 (AAC LC + SBR + PS).
Backport libfaad commit https://github.com/knik0/faad2/commit/d35cf8f24d55112451074424f8896e695ce9ee6b
Change-Id: I0d637d2be36f5e4bb10d7d09adc442b470e81bf7
+7
-3
+7
-3
lib/rbcodec/codecs/libfaad/mp4.c
+7
-3
lib/rbcodec/codecs/libfaad/mp4.c
···
113
113
0, /* 27 ER Parametric */
114
114
#endif
115
115
0, /* 28 (Reserved) */
116
-
0, /* 29 (Reserved) */
116
+
#ifdef PS_DEC
117
+
1, /* 29 AAC LC + SBR + PS */
118
+
#else
119
+
0, /* 29 AAC LC + SBR + PS */
120
+
#endif
117
121
0, /* 30 (Reserved) */
118
122
0 /* 31 (Reserved) */
119
123
};
···
188
192
189
193
#ifdef SBR_DEC
190
194
mp4ASC->sbr_present_flag = -1;
191
-
if (mp4ASC->objectTypeIndex == 5)
195
+
if (mp4ASC->objectTypeIndex == 5 || mp4ASC->objectTypeIndex == 29)
192
196
{
193
197
uint8_t tmp;
194
198
···
242
246
#ifdef SBR_DEC
243
247
bits_to_decode = (int8_t)(buffer_size*8 - faad_get_processed_bits(&ld));
244
248
245
-
if ((mp4ASC->objectTypeIndex != 5) && (bits_to_decode >= 16))
249
+
if ((mp4ASC->objectTypeIndex != 5 && mp4ASC->objectTypeIndex != 29) && (bits_to_decode >= 16))
246
250
{
247
251
int16_t syncExtensionType = (int16_t)faad_getbits(&ld, 11
248
252
DEBUGVAR(1,9,"parse_audio_decoder_specific_info(): syncExtensionType"));