diff options
author | Glenn Kasten <gkasten@google.com> | 2014-04-03 17:11:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 17:11:25 +0000 |
commit | 52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8 (patch) | |
tree | 9c3f023eaffaea5a6af70438c30a4f1158e1211a /media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp | |
parent | 8260bf63e2fa974b524029f170d9ad17b69b884f (diff) | |
parent | 51b3ea2b8f7298bffbd246c65a606cd053357b66 (diff) | |
download | frameworks_av-52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8.zip frameworks_av-52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8.tar.gz frameworks_av-52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8.tar.bz2 |
am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"
* commit '51b3ea2b8f7298bffbd246c65a606cd053357b66':
64-bit: Correction to OMX_U32 and OMX_S32
Diffstat (limited to 'media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp')
-rw-r--r-- | media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp b/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp index ff2b503..0d07a05 100644 --- a/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp +++ b/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp @@ -308,7 +308,7 @@ status_t SoftAACEncoder2::setAudioParams() { // We call this whenever sample rate, number of channels or bitrate change // in reponse to setParameter calls. - ALOGV("setAudioParams: %lu Hz, %lu channels, %lu bps", + ALOGV("setAudioParams: %u Hz, %u channels, %u bps", mSampleRate, mNumChannels, mBitRate); if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_AOT, @@ -364,7 +364,7 @@ void SoftAACEncoder2::onQueueFilled(OMX_U32 portIndex) { OMX_U32 actualBitRate = aacEncoder_GetParam(mAACEncoder, AACENC_BITRATE); if (mBitRate != actualBitRate) { - ALOGW("Requested bitrate %lu unsupported, using %lu", mBitRate, actualBitRate); + ALOGW("Requested bitrate %u unsupported, using %u", mBitRate, actualBitRate); } AACENC_InfoStruct encInfo; |