summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/media/mediarecorder.h3
-rw-r--r--include/media/stagefright/MPEG2TSWriter.h5
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();