diff options
| author | Andreas Huber <andih@google.com> | 2010-09-28 11:27:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-28 11:27:33 -0700 |
| commit | 3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7 (patch) | |
| tree | f531b978ba94698bcbbf5391cb63c5159c3a5ba1 /cmds | |
| parent | 08cf57d791e50ecafe2728a7617a6487aeb6d6d5 (diff) | |
| parent | c751eccad38cf46d7478eca85beefecd2c2b4c3b (diff) | |
| download | frameworks_base-3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7.zip frameworks_base-3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7.tar.gz frameworks_base-3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7.tar.bz2 | |
Merge "Squashed commit of the following:" into gingerbread
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index 8b54871..f55b746 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -46,6 +46,7 @@ #include <media/mediametadataretriever.h> #include <media/stagefright/foundation/hexdump.h> +#include <media/stagefright/MPEG2TSWriter.h> #include <media/stagefright/MPEG4Writer.h> #include <fcntl.h> @@ -366,8 +367,13 @@ status_t DetectSyncSource::read( static void writeSourcesToMP4( Vector<sp<MediaSource> > &sources, bool syncInfoPresent) { +#if 0 sp<MPEG4Writer> writer = new MPEG4Writer(gWriteMP4Filename.string()); +#else + sp<MPEG2TSWriter> writer = + new MPEG2TSWriter(gWriteMP4Filename.string()); +#endif // at most one minute. writer->setMaxFileDuration(60000000ll); |