diff options
author | Robert Shih <robertshih@google.com> | 2014-02-07 16:59:35 -0800 |
---|---|---|
committer | Robert Shih <robertshih@google.com> | 2014-03-06 14:27:56 -0800 |
commit | 343947abc8b7c126f966fd32a0b18bff6c2cecd1 (patch) | |
tree | 211261c7f1985676176ce01891ba0529300aef55 /include | |
parent | 7a0662afeba50b78f43ce24539230cace30c3cfd (diff) | |
download | frameworks_av-343947abc8b7c126f966fd32a0b18bff6c2cecd1.zip frameworks_av-343947abc8b7c126f966fd32a0b18bff6c2cecd1.tar.gz frameworks_av-343947abc8b7c126f966fd32a0b18bff6c2cecd1.tar.bz2 |
Stagefright: added WebM muxer.
Change-Id: I50bbf9c6f089b205d5ecef1371bfdd2028b3b358
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. |