fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-03-03 18:07:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge "Fix potential invalid memory access for concealment in decodeEnvelope()" am: 6acfe3b799 am: 3d9793633e

Browse Source 
am: 0cd0a834f6

Change-Id: Ibb76aaeeb9c8d3c844d41d9b60ce2949017af774
This commit is contained in:
Jean-Michel Trivi 2018-12-28 15:23:41 -08:00 committed by android-build-merger
commit 762902309e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libSBRdec/src/env_dec.cpp
View File

@ -506,15 +506,20 @@ static void decodeEnvelope(
*/ */
for (i = 0; i < hHeaderData->freqBandData.nSfb[1]; i++) { for (i = 0; i < hHeaderData->freqBandData.nSfb[1]; i++) {
/* Former Level-Channel will be used for both channels */ /* Former Level-Channel will be used for both channels */
if (h_prev_data->coupling == COUPLING_BAL) if (h_prev_data->coupling == COUPLING_BAL) {
h_prev_data->sfb_nrg_prev[i] = otherChannel->sfb_nrg_prev[i]; h_prev_data->sfb_nrg_prev[i] =
(otherChannel != NULL) ? otherChannel->sfb_nrg_prev[i]
: (FIXP_SGL)SBR_ENERGY_PAN_OFFSET;
}
/* Former L/R will be combined as the new Level-Channel */ /* Former L/R will be combined as the new Level-Channel */
else if (h_sbr_data->coupling == COUPLING_LEVEL) else if (h_sbr_data->coupling == COUPLING_LEVEL &&
otherChannel != NULL) {
h_prev_data->sfb_nrg_prev[i] = (h_prev_data->sfb_nrg_prev[i] + h_prev_data->sfb_nrg_prev[i] = (h_prev_data->sfb_nrg_prev[i] +
otherChannel->sfb_nrg_prev[i]) >> otherChannel->sfb_nrg_prev[i]) >>
1; 1;
else if (h_sbr_data->coupling == COUPLING_BAL) } else if (h_sbr_data->coupling == COUPLING_BAL) {
h_prev_data->sfb_nrg_prev[i] = (FIXP_SGL)SBR_ENERGY_PAN_OFFSET; h_prev_data->sfb_nrg_prev[i] = (FIXP_SGL)SBR_ENERGY_PAN_OFFSET;
}
} }
} }
} }