diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 23:37:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 23:37:19 +0000 |
| commit | 1b24cf32e02a1372e57b3a2a432bc0adfe496e6d (patch) | |
| tree | 220f4583ae1081df62fa5c861eed3e9e90a24515 /libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp | |
| parent | 4845b69f70ff457be8d8908f6eb61e2af67e00d3 (diff) | |
| parent | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (diff) | |
| download | frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.zip frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.gz frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.bz2 | |
am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Diffstat (limited to 'libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp')
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp index e60030e..e1a81d8 100755 --- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include <inttypes.h> + #define LOG_NDEBUG 1 #define LOG_TAG "VideoEditorAudioPlayer" #include <utils/Log.h> @@ -372,7 +374,7 @@ status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) { // Get the duration in time of the audio BT if ( result == M4NO_ERROR ) { - ALOGV("VEAP: channels = %d freq = %d", + ALOGV("VEAP: channels = %" PRIu32 " freq = %" PRIu32, mAudioMixSettings->uiNbChannels, mAudioMixSettings->uiSamplingFrequency); // No trim @@ -440,7 +442,7 @@ status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) { // do nothing } - ALOGV("VideoEditorAudioPlayer::startTime %d", startTime); + ALOGV("VideoEditorAudioPlayer::startTime %" PRIu32, startTime); seekTimeStamp = 0; if (startTime) { if (startTime >= mBGAudioPCMFileDuration) { |