diff options
| author | Kenny Root <kroot@google.com> | 2010-10-14 23:58:41 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-14 23:58:41 -0700 |
| commit | f9f083e2853740c97588f4db82c24645ae5880e4 (patch) | |
| tree | 5d045dddcf9e85e4826286c28662050b9d4a935d /include/media | |
| parent | d6119356f45c9c57cac812357d969ecc3001087e (diff) | |
| parent | e4edd632d48720b44f7878273f46d192d5703150 (diff) | |
| download | frameworks_av-f9f083e2853740c97588f4db82c24645ae5880e4.zip frameworks_av-f9f083e2853740c97588f4db82c24645ae5880e4.tar.gz frameworks_av-f9f083e2853740c97588f4db82c24645ae5880e4.tar.bz2 | |
resolved conflicts for merge of a127c07c to master
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
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 a600f6b..32b6fa1 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(); |