|
|
@@ -156,16 +156,23 @@ static int read_mp4_header(unsigned long *samplerate_p, unsigned char *channels_
|
|
|
info.sampRateCore = (*ptr++ & 0x07) << 1;
|
|
|
info.sampRateCore |= (*ptr >> 7) & 0x01;
|
|
|
info.sampRateCore = rates[info.sampRateCore];
|
|
|
- info.nChans = (*ptr++ & 0x7f) >> 3;
|
|
|
- *channels_p = info.nChans;
|
|
|
- if (desc_len > 2 && ((ptr[0] << 3) | (ptr[1] >> 5)) == 0x2b7 && (ptr[1] & 0x1f) == 0x05 && (ptr[2] & 0x80)) {
|
|
|
- *samplerate_p = rates[(ptr[2] & 0x78) >> 3];
|
|
|
- LOG_WARN("AAC SBR mode activated => high CPU consumption expected, please use LMS proxy to mitigate");
|
|
|
- } else {
|
|
|
+ info.nChans = (*ptr & 0x7f) >> 3;
|
|
|
+ *channels_p = info.nChans;
|
|
|
+ // Note that 24 bits frequencies are not handled
|
|
|
+ if (info.profile == 5) {
|
|
|
+ *samplerate_p = rates[((ptr[0] & 0x03) << 1) | (ptr[1] >> 7)];
|
|
|
+ LOG_WARN("AAC stream with SBR => high CPU required (use LMS proxied mode)");
|
|
|
+ } else if (desc_len > 2 && ((ptr[1] << 3) | (ptr[2] >> 5)) == 0x2b7 && (ptr[2] & 0x1f) == 0x05 && (ptr[3] & 0x80)) {
|
|
|
+ *samplerate_p = rates[(ptr[3] & 0x78) >> 3];
|
|
|
+ LOG_WARN("AAC stream with extended SBR => high CPU required (use LMS proxied mode)");
|
|
|
+ } else if (info.profile == 2 || info.profile == 29) {
|
|
|
*samplerate_p = info.sampRateCore;
|
|
|
+ } else {
|
|
|
+ *samplerate_p = 44100;
|
|
|
+ LOG_ERROR("AAC audio object type %d not handled", info.profile);
|
|
|
}
|
|
|
HAAC(a, SetRawBlockParams, a->hAac, 0, &info);
|
|
|
- LOG_DEBUG("playable aac track: %u (p:%x, r:%d, c:%d)", trak, info.profile, info.sampRateCore, info.nChans);
|
|
|
+ LOG_DEBUG("playable aac track: %u (p:%x, r:%d, c:%d, desc_len:%d)", trak, info.profile, info.sampRateCore, info.nChans, desc_len);
|
|
|
play = trak;
|
|
|
}
|
|
|
|
Philippe G