diff options
| author | Andreas Huber <andih@google.com> | 2010-10-13 09:14:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-13 09:14:40 -0700 |
| commit | 312644cdbb39522fe9cac028b15b907ce0e8e0f7 (patch) | |
| tree | 97dd25e42b1a0ccc607cdbbc60368b833c44a71e /include/media | |
| parent | 165c6579660c22edafb61fee2a0cf39334a2a905 (diff) | |
| parent | 9adf466021d37a5062d7d3361e14bfd9e7ffeba6 (diff) | |
| download | frameworks_base-312644cdbb39522fe9cac028b15b907ce0e8e0f7.zip frameworks_base-312644cdbb39522fe9cac028b15b907ce0e8e0f7.tar.gz frameworks_base-312644cdbb39522fe9cac028b15b907ce0e8e0f7.tar.bz2 | |
Merge "Support for writing to MPEG2 transport stream files." into gingerbread
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(); |