diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 16:11:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 16:11:23 +0000 |
| commit | 0713b4acff1a489e7d49725dc7c5e3dad370b5c8 (patch) | |
| tree | 6717743d4422e9d88e9a9f1631effd7563a9856b /libAACenc/src/aacenc_lib.cpp | |
| parent | f86e64f5c712edc2f3dd0a9d59d75a8ebd3422ea (diff) | |
| parent | ef30836651bf059c3120c03dd11e08b6aafdae13 (diff) | |
| download | fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.tar.gz fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.tar.bz2 fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.zip | |
Remove compiler warnings, revised ARM QMF encoder
am: ef30836
* commit 'ef30836651bf059c3120c03dd11e08b6aafdae13':
Remove compiler warnings, revised ARM QMF encoder
Change-Id: I07babb4dc36b6ad7aebeb62c303a8380e99d691e
Diffstat (limited to 'libAACenc/src/aacenc_lib.cpp')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 63563fd..02f83bf 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -98,7 +98,7 @@ amm-info@iis.fraunhofer.de /* Encoder library info */ #define AACENCODER_LIB_VL0 3 #define AACENCODER_LIB_VL1 4 -#define AACENCODER_LIB_VL2 12 +#define AACENCODER_LIB_VL2 14 #define AACENCODER_LIB_TITLE "AAC Encoder" #ifdef __ANDROID__ #define AACENCODER_LIB_BUILD_DATE "" @@ -303,7 +303,7 @@ static AACENC_ERROR eldSbrConfigurator( int i, cfgIdx = -1; const ULONG channelBitrate = totalBitrate / FDKaacEnc_GetChannelModeConfiguration(channelMode)->nChannelsEff; - for (i=0; i<(sizeof(eldSbrAutoConfigTab)/sizeof(ELD_SBR_CONFIGURATOR)); i++) { + for (i=0; i<(int)(sizeof(eldSbrAutoConfigTab)/sizeof(ELD_SBR_CONFIGURATOR)); i++) { if ( (samplingRate <= eldSbrAutoConfigTab[i].samplingRate) && (channelBitrate >= eldSbrAutoConfigTab[i].bitrateRange) ) { @@ -914,7 +914,7 @@ AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder, } else { /* SBR ratio has been set by the user, so use it. */ - hAacConfig->sbrRatio = config->userSbrRatio; + hAacConfig->sbrRatio = isSbrActive(hAacConfig) ? config->userSbrRatio : 0; } { @@ -1998,7 +1998,7 @@ AACENC_ERROR aacEncoder_SetParam( break; case AACENC_METADATA_MODE: if ((UINT)settings->userMetaDataMode != value) { - if ( !((value>=0) && (value<=2)) ) { + if ( !(((INT)value>=0) && ((INT)value<=2)) ) { err = AACENC_INVALID_CONFIG; break; } |