diff options
| author | Robert Shih <robertshih@google.com> | 2014-03-10 19:01:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-10 19:01:49 +0000 |
| commit | a5ae9aa74b1217eb838c2ba092ba2429dcaf10e8 (patch) | |
| tree | 3dd58033277760eb2bfbefe31c0cd7d64c2a602a /include | |
| parent | 3a90f2849d49bf65f2d6257fd6da30ae46d745fa (diff) | |
| parent | 343947abc8b7c126f966fd32a0b18bff6c2cecd1 (diff) | |
| download | frameworks_av-a5ae9aa74b1217eb838c2ba092ba2429dcaf10e8.zip frameworks_av-a5ae9aa74b1217eb838c2ba092ba2429dcaf10e8.tar.gz frameworks_av-a5ae9aa74b1217eb838c2ba092ba2429dcaf10e8.tar.bz2 | |
Merge "Stagefright: added WebM muxer."
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaMuxer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/stagefright/MediaMuxer.h b/include/media/stagefright/MediaMuxer.h index ff6a66e..bbe4303 100644 --- a/include/media/stagefright/MediaMuxer.h +++ b/include/media/stagefright/MediaMuxer.h @@ -30,7 +30,7 @@ struct MediaAdapter; struct MediaBuffer; struct MediaSource; struct MetaData; -struct MPEG4Writer; +struct MediaWriter; // MediaMuxer is used to mux multiple tracks into a video. Currently, we only // support a mp4 file as the output. @@ -44,6 +44,7 @@ public: // OutputFormat is updated. enum OutputFormat { OUTPUT_FORMAT_MPEG_4 = 0, + OUTPUT_FORMAT_WEBM = 1, OUTPUT_FORMAT_LIST_END // must be last - used to validate format type }; @@ -115,7 +116,8 @@ public: int64_t timeUs, uint32_t flags) ; private: - sp<MPEG4Writer> mWriter; + const OutputFormat mFormat; + sp<MediaWriter> mWriter; Vector< sp<MediaAdapter> > mTrackList; // Each track has its MediaAdapter. sp<MetaData> mFileMeta; // Metadata for the whole file. |