am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc': stagefright aacenc: Zero-initialize a struct
This commit is contained in:
committed by
Android Git Automerger
commit
5f83b95705
@@ -26,6 +26,7 @@
|
|||||||
#include "adj_thr.h"
|
#include "adj_thr.h"
|
||||||
#include "qc_data.h"
|
#include "qc_data.h"
|
||||||
#include "line_pe.h"
|
#include "line_pe.h"
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
|
||||||
#define minSnrLimit 0x6666 /* 1 dB */
|
#define minSnrLimit 0x6666 /* 1 dB */
|
||||||
@@ -1138,6 +1139,7 @@ void AdjustThresholds(ADJ_THR_STATE *adjThrState,
|
|||||||
Word16 maxBitresBits = elBits->maxBits;
|
Word16 maxBitresBits = elBits->maxBits;
|
||||||
Word16 sideInfoBits = (qcOE->staticBitsUsed + qcOE->ancBitsUsed);
|
Word16 sideInfoBits = (qcOE->staticBitsUsed + qcOE->ancBitsUsed);
|
||||||
Word16 ch;
|
Word16 ch;
|
||||||
|
memset(&peData, 0, sizeof(peData));
|
||||||
|
|
||||||
prepareSfbPe(&peData, psyOutChannel, logSfbEnergy, sfbNRelevantLines, nChannels, AdjThrStateElement->peOffset);
|
prepareSfbPe(&peData, psyOutChannel, logSfbEnergy, sfbNRelevantLines, nChannels, AdjThrStateElement->peOffset);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user