diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-04-03 10:20:09 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-04-03 10:20:09 -0700 |
| commit | 619fd4d6d4d815065becbdf360422ee40dfa7690 (patch) | |
| tree | 1722d64e9bafe4c28f50b18dd9d4aa2cf025ca75 /media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp | |
| parent | 0a8be80261d61e29ab4a99720e68879ae7bc3c0e (diff) | |
| parent | 52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8 (diff) | |
| download | frameworks_av-619fd4d6d4d815065becbdf360422ee40dfa7690.zip frameworks_av-619fd4d6d4d815065becbdf360422ee40dfa7690.tar.gz frameworks_av-619fd4d6d4d815065becbdf360422ee40dfa7690.tar.bz2 | |
Merge commit '52a23bd3' into manualmerge
Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
Diffstat (limited to 'media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp')
| -rw-r--r-- | media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp b/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp index 0c62ec0..1301060 100644 --- a/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp +++ b/media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp @@ -210,7 +210,7 @@ OMX_ERRORTYPE SoftFlacEncoder::internalSetParameter( mNumChannels = pcmParams->nChannels; mSampleRate = pcmParams->nSamplingRate; - ALOGV("will encode %ld channels at %ldHz", mNumChannels, mSampleRate); + ALOGV("will encode %d channels at %dHz", mNumChannels, mSampleRate); return configureEncoder(); } @@ -264,7 +264,7 @@ OMX_ERRORTYPE SoftFlacEncoder::internalSetParameter( void SoftFlacEncoder::onQueueFilled(OMX_U32 portIndex) { UNUSED_UNLESS_VERBOSE(portIndex); - ALOGV("SoftFlacEncoder::onQueueFilled(portIndex=%ld)", portIndex); + ALOGV("SoftFlacEncoder::onQueueFilled(portIndex=%d)", portIndex); if (mSignalledError) { return; @@ -296,7 +296,7 @@ void SoftFlacEncoder::onQueueFilled(OMX_U32 portIndex) { } if (inHeader->nFilledLen > kMaxInputBufferSize) { - ALOGE("input buffer too large (%ld).", inHeader->nFilledLen); + ALOGE("input buffer too large (%d).", inHeader->nFilledLen); mSignalledError = true; notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL); return; @@ -412,7 +412,7 @@ FLAC__StreamEncoderWriteStatus SoftFlacEncoder::onEncodedFlacAvailable( OMX_ERRORTYPE SoftFlacEncoder::configureEncoder() { - ALOGV("SoftFlacEncoder::configureEncoder() numChannel=%ld, sampleRate=%ld", + ALOGV("SoftFlacEncoder::configureEncoder() numChannel=%d, sampleRate=%d", mNumChannels, mSampleRate); if (mSignalledError || (mFlacStreamEncoder == NULL)) { |