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

For all scaleValuesSaturate() variants make source pointer const. 

Bug: 145669510
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ib69a4f12405026d3165193f0192eb25eaed7e797
This commit is contained in:
Fraunhofer IIS FDK 2019-10-29 13:10:10 +01:00 committed by Jean-Michel Trivi
parent 40c083f59a
commit 9d40b65b15
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libFDK/include/scale.h
View File

@ -129,15 +129,13 @@ void scaleCplxValues(FIXP_DBL *r_dst, FIXP_DBL *i_dst, const FIXP_DBL *r_src,
void scaleValuesWithFactor(FIXP_DBL *vector, FIXP_DBL factor, INT len, void scaleValuesWithFactor(FIXP_DBL *vector, FIXP_DBL factor, INT len,
INT scalefactor); INT scalefactor);
void scaleValuesSaturate(FIXP_DBL *vector, INT len, INT scalefactor); void scaleValuesSaturate(FIXP_DBL *vector, INT len, INT scalefactor);
void scaleValuesSaturate(FIXP_DBL *dst, FIXP_DBL *src, INT len, void scaleValuesSaturate(FIXP_DBL *dst, const FIXP_DBL *src, INT len,
INT scalefactor); INT scalefactor);
void scaleValuesSaturate(FIXP_SGL *dst, FIXP_DBL *src, INT len, void scaleValuesSaturate(FIXP_SGL *dst, const FIXP_DBL *src, INT len,
INT scalefactor); INT scalefactor);
void scaleValuesSaturate(INT_PCM *dst, FIXP_DBL *src, INT len, INT scalefactor);
void scaleValuesSaturate(FIXP_SGL *vector, INT len, INT scalefactor); void scaleValuesSaturate(FIXP_SGL *vector, INT len, INT scalefactor);
void scaleValuesSaturate(FIXP_SGL *dst, FIXP_SGL *src, INT len, void scaleValuesSaturate(FIXP_SGL *dst, const FIXP_SGL *src, INT len,
INT scalefactor); INT scalefactor);
void scaleValuesSaturate(INT_PCM *dst, INT_PCM *src, INT len, INT scalefactor);
INT getScalefactorShort(const SHORT *vector, INT len); INT getScalefactorShort(const SHORT *vector, INT len);
INT getScalefactorPCM(const INT_PCM *vector, INT len, INT stride); INT getScalefactorPCM(const INT_PCM *vector, INT len, INT stride);
INT getScalefactor(const FIXP_DBL *vector, INT len); INT getScalefactor(const FIXP_DBL *vector, INT len);

26
libFDK/src/scale.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 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -250,10 +250,10 @@ void scaleValuesSaturate(FIXP_DBL *vector, /*!< Vector */
*/ */
#define FUNCTION_scaleValuesSaturate_DBL_DBL #define FUNCTION_scaleValuesSaturate_DBL_DBL
SCALE_INLINE SCALE_INLINE
void scaleValuesSaturate(FIXP_DBL *dst, /*!< Output */ void scaleValuesSaturate(FIXP_DBL *dst, /*!< Output */
FIXP_DBL *src, /*!< Input */ const FIXP_DBL *src, /*!< Input */
INT len, /*!< Length */ INT len, /*!< Length */
INT scalefactor /*!< Scalefactor */ INT scalefactor /*!< Scalefactor */
) { ) {
INT i; INT i;
@ -285,10 +285,10 @@ void scaleValuesSaturate(FIXP_DBL *dst, /*!< Output */
*/ */
#define FUNCTION_scaleValuesSaturate_SGL_DBL #define FUNCTION_scaleValuesSaturate_SGL_DBL
SCALE_INLINE SCALE_INLINE
void scaleValuesSaturate(FIXP_SGL *dst, /*!< Output */ void scaleValuesSaturate(FIXP_SGL *dst, /*!< Output */
FIXP_DBL *src, /*!< Input */ const FIXP_DBL *src, /*!< Input */
INT len, /*!< Length */ INT len, /*!< Length */
INT scalefactor) /*!< Scalefactor */ INT scalefactor) /*!< Scalefactor */
{ {
INT i; INT i;
scalefactor = fixmax_I(fixmin_I(scalefactor, (INT)DFRACT_BITS - 1), scalefactor = fixmax_I(fixmin_I(scalefactor, (INT)DFRACT_BITS - 1),
@ -345,10 +345,10 @@ void scaleValuesSaturate(FIXP_SGL *vector, /*!< Vector */
*/ */
#define FUNCTION_scaleValuesSaturate_SGL_SGL #define FUNCTION_scaleValuesSaturate_SGL_SGL
SCALE_INLINE SCALE_INLINE
void scaleValuesSaturate(FIXP_SGL *dst, /*!< Output */ void scaleValuesSaturate(FIXP_SGL *dst, /*!< Output */
FIXP_SGL *src, /*!< Input */ const FIXP_SGL *src, /*!< Input */
INT len, /*!< Length */ INT len, /*!< Length */
INT scalefactor /*!< Scalefactor */ INT scalefactor /*!< Scalefactor */
) { ) {
INT i; INT i;