diff options
| author | Andreas Huber <andih@google.com> | 2010-10-13 09:19:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 09:19:28 -0700 |
| commit | e4edd632d48720b44f7878273f46d192d5703150 (patch) | |
| tree | 4dc92f8f6371da457d7c20e59194e73cf66d3659 /include/media | |
| parent | 43024e1f4953d9b8891b7b72f10e76f11812e772 (diff) | |
| parent | 5cb77e080ced5362b5f047e107327b3cb6ece6c9 (diff) | |
| download | frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.zip frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.tar.gz frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.tar.bz2 | |
am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp
* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
Support for writing to MPEG2 transport stream files.
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/mediarecorder.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MPEG2TSWriter.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 291b18a..5ab1640 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -76,6 +76,9 @@ enum output_format { /* Stream over a socket, limited to a single stream */ OUTPUT_FORMAT_RTP_AVP = 7, + /* H.264/AAC data encapsulated in MPEG2/TS */ + OUTPUT_FORMAT_MPEG2TS = 8, + OUTPUT_FORMAT_LIST_END // must be last - used to validate format type }; diff --git a/include/media/stagefright/MPEG2TSWriter.h b/include/media/stagefright/MPEG2TSWriter.h index 551ca01..f2c6505 100644 --- a/include/media/stagefright/MPEG2TSWriter.h +++ b/include/media/stagefright/MPEG2TSWriter.h @@ -25,7 +25,10 @@ namespace android { +struct ABuffer; + struct MPEG2TSWriter : public MediaWriter { + MPEG2TSWriter(int fd); MPEG2TSWriter(const char *filename); virtual status_t addSource(const sp<MediaSource> &source); @@ -59,6 +62,8 @@ private: int64_t mNumTSPacketsWritten; int64_t mNumTSPacketsBeforeMeta; + void init(); + void writeTS(); void writeProgramAssociationTable(); void writeProgramMap(); |