summaryrefslogtreecommitdiffstats
path: root/cmds/stagefright/record.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-08-27 14:50:58 -0700
committerAndreas Huber <andih@google.com>2009-08-27 14:50:58 -0700
commite0f0b08aa692d15f3bfa19e10abfc84803c099b4 (patch)
tree703584f606b9719817bd5ff42a3979a7576c1551 /cmds/stagefright/record.cpp
parent152755d265427fb47d836f1022585afab61e0350 (diff)
downloadframeworks_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/record.cpp')
-rw-r--r--cmds/stagefright/record.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp
index cf2962b..9a2416b 100644
--- a/cmds/stagefright/record.cpp
+++ b/cmds/stagefright/record.cpp
@@ -26,7 +26,6 @@
#include <media/stagefright/MmapSource.h>
#include <media/stagefright/OMXClient.h>
#include <media/stagefright/OMXCodec.h>
-#include <media/stagefright/OMXDecoder.h>
using namespace android;
@@ -87,8 +86,6 @@ private:
DummySource &operator=(const DummySource &);
};
-#define USE_OMX_CODEC 1
-
sp<MediaSource> createSource(const char *filename) {
sp<MediaSource> source;
@@ -140,13 +137,8 @@ int main(int argc, char **argv) {
sp<MetaData> meta = source->getFormat();
-#if USE_OMX_CODEC
sp<OMXCodec> decoder = OMXCodec::Create(
client.interface(), meta, false /* createEncoder */, source);
-#else
- sp<OMXDecoder> decoder = OMXDecoder::Create(
- &client, meta, false /* createEncoder */, source);
-#endif
int width, height;
bool success = meta->findInt32(kKeyWidth, &width);
@@ -164,14 +156,9 @@ int main(int argc, char **argv) {
enc_meta->setInt32(kKeyWidth, width);
enc_meta->setInt32(kKeyHeight, height);
-#if USE_OMX_CODEC
sp<OMXCodec> encoder =
OMXCodec::Create(
client.interface(), enc_meta, true /* createEncoder */, decoder);
-#else
- sp<OMXDecoder> encoder = OMXDecoder::Create(
- &client, enc_meta, true /* createEncoder */, decoder);
-#endif
#if 1
sp<MPEG4Writer> writer = new MPEG4Writer("/sdcard/output.mp4");