summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTenghui Zhu <ztenghui@google.com>2013-03-14 22:42:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-14 22:42:44 +0000
commitb7be24f055426f00fd1ae1af07d5dd40dbcedfe7 (patch)
tree16452ef5ba382cf37a6f63b49f6a399a1cf85d98 /include
parentdb57fae81950e32af019b32421b93d204d67e951 (diff)
parent5883d53cf8300d8b13a1a6ef3310d72a55e191c0 (diff)
downloadframeworks_av-b7be24f055426f00fd1ae1af07d5dd40dbcedfe7.zip
frameworks_av-b7be24f055426f00fd1ae1af07d5dd40dbcedfe7.tar.gz
frameworks_av-b7be24f055426f00fd1ae1af07d5dd40dbcedfe7.tar.bz2
Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MPEG4Writer.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h
index 3596b38..88df6b0 100644
--- a/include/media/stagefright/MPEG4Writer.h
+++ b/include/media/stagefright/MPEG4Writer.h
@@ -35,7 +35,13 @@ public:
MPEG4Writer(const char *filename);
MPEG4Writer(int fd);
+ // Limitations
+ // 1. No more than 2 tracks can be added
+ // 2. Only video or audio source can be added
+ // 3. No more than one video and/or one audio source can be added.
virtual status_t addSource(const sp<MediaSource> &source);
+
+ // Returns INVALID_OPERATION if there is no source or track.
virtual status_t start(MetaData *param = NULL);
virtual status_t stop() { return reset(); }
virtual status_t pause();