fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93 am: bac4f0675f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062

Change-Id: I63ae90c7288f72ce534c33d04bb534b23244d396
This commit is contained in:
Fraunhofer IIS FDK 2021-05-07 22:12:02 +00:00 committed by Automerger Merge Worker
parent 3db8ac7a00 bac4f0675f
commit 7e3add342f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
documentation/aacEncoder.pdf
View File

Binary file not shown.

4
libAACenc/include/aacenc_lib.h
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android Software License for The Fraunhofer FDK AAC Codec Library for Android
© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -1643,7 +1643,7 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder,
* *
* \return * \return
* - AACENC_OK, on succes. * - AACENC_OK, on succes.
* - AACENC_INIT_ERROR, on failure. * - AACENC_INVALID_HANDLE, AACENC_INIT_ERROR, on failure.
*/ */
AACENC_ERROR aacEncInfo(const HANDLE_AACENCODER hAacEncoder, AACENC_ERROR aacEncInfo(const HANDLE_AACENCODER hAacEncoder,
AACENC_InfoStruct *pInfo); AACENC_InfoStruct *pInfo);

7
libAACenc/src/aacenc_lib.cpp
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android Software License for The Fraunhofer FDK AAC Codec Library for Android
© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -2521,6 +2521,11 @@ AACENC_ERROR aacEncInfo(const HANDLE_AACENCODER hAacEncoder,
AACENC_InfoStruct *pInfo) { AACENC_InfoStruct *pInfo) {
AACENC_ERROR err = AACENC_OK; AACENC_ERROR err = AACENC_OK;
if ((hAacEncoder == NULL) || (pInfo == NULL)) {
err = AACENC_INVALID_HANDLE;
goto bail;
}
FDKmemclear(pInfo, sizeof(AACENC_InfoStruct)); FDKmemclear(pInfo, sizeof(AACENC_InfoStruct));
pInfo->confSize = 64; /* pre-initialize */ pInfo->confSize = 64; /* pre-initialize */