diff options
| author | Andreas Huber <andih@google.com> | 2009-08-27 14:50:58 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2009-08-27 14:50:58 -0700 |
| commit | e0f0b08aa692d15f3bfa19e10abfc84803c099b4 (patch) | |
| tree | 703584f606b9719817bd5ff42a3979a7576c1551 /cmds/stagefright/stagefright.cpp | |
| parent | 152755d265427fb47d836f1022585afab61e0350 (diff) | |
| download | frameworks_av-e0f0b08aa692d15f3bfa19e10abfc84803c099b4.zip frameworks_av-e0f0b08aa692d15f3bfa19e10abfc84803c099b4.tar.gz frameworks_av-e0f0b08aa692d15f3bfa19e10abfc84803c099b4.tar.bz2 | |
Squashed commit of the following:
commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:48:54 2009 -0700
Getting rid of more code now obsolete with the departure of OMXDecoder.
commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:33:06 2009 -0700
Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
Diffstat (limited to 'cmds/stagefright/stagefright.cpp')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index e927aae..baa00da 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -33,7 +33,6 @@ #include <media/stagefright/MmapSource.h> #include <media/stagefright/OMXClient.h> #include <media/stagefright/OMXCodec.h> -#include <media/stagefright/OMXDecoder.h> #include "JPEGSource.h" @@ -50,18 +49,11 @@ static int64_t getNowUs() { return (int64_t)tv.tv_usec + tv.tv_sec * 1000000; } -#define USE_OMX_CODEC 1 - static void playSource(OMXClient *client, const sp<MediaSource> &source) { sp<MetaData> meta = source->getFormat(); -#if !USE_OMX_CODEC - sp<OMXDecoder> decoder = OMXDecoder::Create( - client, meta, false /* createEncoder */, source); -#else sp<OMXCodec> decoder = OMXCodec::Create( client->interface(), meta, false /* createEncoder */, source); -#endif if (decoder == NULL) { return; |