diff options
author | ztenghui <ztenghui@google.com> | 2013-03-08 23:13:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-08 23:13:08 +0000 |
commit | 70369845f8250df4f6f22c336414b4df0a3ce53e (patch) | |
tree | c1b635a2b80aff583bf569f53942239727369038 /include | |
parent | 2797b47f8a74b902d445cd89755e2349136a8b6b (diff) | |
parent | 3db62dfc5102247d415df4667bd9609e669fc022 (diff) | |
download | frameworks_av-70369845f8250df4f6f22c336414b4df0a3ce53e.zip frameworks_av-70369845f8250df4f6f22c336414b4df0a3ce53e.tar.gz frameworks_av-70369845f8250df4f6f22c336414b4df0a3ce53e.tar.bz2 |
Merge "Clean up the native code to match Java update" into jb-mr2-dev
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/MediaMuxer.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/include/media/stagefright/MediaMuxer.h b/include/media/stagefright/MediaMuxer.h index 27a141e..167d0d9 100644 --- a/include/media/stagefright/MediaMuxer.h +++ b/include/media/stagefright/MediaMuxer.h @@ -40,11 +40,25 @@ struct MPEG4Writer; // deleting the output file after stop. struct MediaMuxer : public RefBase { public: + // Please update media/java/android/media/MediaMuxer.java if the + // SampleFlags is updated. + enum SampleFlags { + SAMPLE_FLAG_SYNC = 1, + }; + + // Please update media/java/android/media/MediaMuxer.java if the + // OutputFormat is updated. + enum OutputFormat { + OUTPUT_FORMAT_MPEG_4 = 0, + OUTPUT_FORMAT_LIST_END // must be last - used to validate format type + }; + // Construct the muxer with the output file path. - MediaMuxer(const char* pathOut); + MediaMuxer(const char *path, OutputFormat format); + // Construct the muxer with the file descriptor. Note that the MediaMuxer // will close this file at stop(). - MediaMuxer(int fd); + MediaMuxer(int fd, OutputFormat format); virtual ~MediaMuxer(); @@ -94,6 +108,7 @@ private: Mutex mMuxerLock; enum State { + UNINITED, INITED, STARTED, STOPPED |