devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Codecs: mp4: Support object type 29 (AAC LC + SBR + PS).

Browse source 
Backport libfaad commit d35cf8f24d

Change-Id: I0d637d2be36f5e4bb10d7d09adc442b470e81bf7
This commit is contained in:
Roman Artiukhin 2024-02-04 15:53:58 +02:00
parent 9af325a541
commit ef6da7503a
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/rbcodec/codecs/libfaad/mp4.c
View file

@ -113,7 +113,11 @@ static uint8_t ObjectTypesTable[32] = {
0, /* 27 ER Parametric */
#endif
0, /* 28 (Reserved) */
0, /* 29 (Reserved) */
#ifdef PS_DEC
1, /* 29 AAC LC + SBR + PS */
#else
0, /* 29 AAC LC + SBR + PS */
#endif
0, /* 30 (Reserved) */
0 /* 31 (Reserved) */
};
@ -188,7 +192,7 @@ int8_t AudioSpecificConfig2(uint8_t *pBuffer,
#ifdef SBR_DEC
mp4ASC->sbr_present_flag = -1;
if (mp4ASC->objectTypeIndex == 5)
if (mp4ASC->objectTypeIndex == 5 || mp4ASC->objectTypeIndex == 29)
{
uint8_t tmp;
@ -242,7 +246,7 @@ int8_t AudioSpecificConfig2(uint8_t *pBuffer,
#ifdef SBR_DEC
bits_to_decode = (int8_t)(buffer_size*8 - faad_get_processed_bits(&ld));
if ((mp4ASC->objectTypeIndex != 5) && (bits_to_decode >= 16))
if ((mp4ASC->objectTypeIndex != 5 && mp4ASC->objectTypeIndex != 29) && (bits_to_decode >= 16))
{
int16_t syncExtensionType = (int16_t)faad_getbits(&ld, 11
DEBUGVAR(1,9,"parse_audio_decoder_specific_info(): syncExtensionType"));