diff options
| author | Lajos Molnar <lajos@google.com> | 2016-02-12 17:40:50 -0800 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2016-02-12 17:41:22 -0800 |
| commit | c701e49181339c572d05bf06186c67c6e40f6b0e (patch) | |
| tree | 6fb0bdec271fd95ac0505b4a55f0426c6f775597 | |
| parent | c0fa48bb56a868a1144dee55eed64d6d6e22338d (diff) | |
| download | brillo-c701e49181339c572d05bf06186c67c6e40f6b0e.tar.gz | |
audio: remove brillo_audio_test dependency on OMXCodec
| -rw-r--r-- | pts/audio/brillo-audio-test/stagefright_playback.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pts/audio/brillo-audio-test/stagefright_playback.cpp b/pts/audio/brillo-audio-test/stagefright_playback.cpp index ee74ee0..4e60ebc 100644 --- a/pts/audio/brillo-audio-test/stagefright_playback.cpp +++ b/pts/audio/brillo-audio-test/stagefright_playback.cpp @@ -22,8 +22,7 @@ #include <media/stagefright/FileSource.h> #include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MetaData.h> -#include <media/stagefright/OMXClient.h> -#include <media/stagefright/OMXCodec.h> +#include <media/stagefright/SimpleDecodingSource.h> #include <media/stagefright/foundation/AMessage.h> #include "include/MP3Extractor.h" @@ -34,8 +33,6 @@ namespace android { status_t PlayStagefrightMp3(const char* filename, int duration_secs) { CHECK(filename); - OMXClient client; - CHECK_EQ(client.connect(), (status_t)OK); FileSource* file_source = new FileSource(filename); status_t status = file_source->initCheck(); @@ -54,7 +51,7 @@ status_t PlayStagefrightMp3(const char* filename, int duration_secs) { // Decode mp3. sp<MetaData> meta_data = media_source->getFormat(); sp<MediaSource> decoded_source = - OMXCodec::Create(client.interface(), meta_data, false, media_source); + SimpleDecodingSource::Create(media_source); // Play mp3. AudioPlayer* player = new AudioPlayer(nullptr); // Initialize without source. |