diff options
| author | Dima Zavin <dima@android.com> | 2011-04-05 16:13:49 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-04-27 10:48:48 -0700 |
| commit | 6859837b0bdea82be855ab50bd69c5ac9b62acf2 (patch) | |
| tree | b1df1a7602378396d2087cb2f02cd9c055d22ab8 /libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp | |
| parent | 0a389ab70db304fb840e33f33781ecc0503eae3c (diff) | |
| download | frameworks_av-6859837b0bdea82be855ab50bd69c5ac9b62acf2.zip frameworks_av-6859837b0bdea82be855ab50bd69c5ac9b62acf2.tar.gz frameworks_av-6859837b0bdea82be855ab50bd69c5ac9b62acf2.tar.bz2 | |
libvideoeditor: convert to use new audio.h
Change-Id: I39726f6f6cd5aabbd91629f329876660b3d3cec2
Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp')
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp index a83e7b6..1628d33 100755 --- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp @@ -28,6 +28,8 @@ #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> +#include <hardware/audio.h> + #include "PreviewPlayer.h" namespace android { @@ -299,7 +301,7 @@ status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) { if (mAudioSink.get() != NULL) { status_t err = mAudioSink->open( - mSampleRate, numChannels, AudioSystem::PCM_16_BIT, + mSampleRate, numChannels, AUDIO_FORMAT_PCM_16_BIT, DEFAULT_AUDIOSINK_BUFFERCOUNT, &VideoEditorAudioPlayer::AudioSinkCallback, this); if (err != OK) { @@ -321,10 +323,10 @@ status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) { mAudioSink->start(); } else { mAudioTrack = new AudioTrack( - AudioSystem::MUSIC, mSampleRate, AudioSystem::PCM_16_BIT, + AUDIO_STREAM_MUSIC, mSampleRate, AUDIO_FORMAT_PCM_16_BIT, (numChannels == 2) - ? AudioSystem::CHANNEL_OUT_STEREO - : AudioSystem::CHANNEL_OUT_MONO, + ? AUDIO_CHANNEL_OUT_STEREO + : AUDIO_CHANNEL_OUT_MONO, 0, 0, &AudioCallback, this, 0); if ((err = mAudioTrack->initCheck()) != OK) { |