diff options
| author | James Dong <jdong@google.com> | 2010-06-25 14:21:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-25 14:21:50 -0700 |
| commit | b472798045c7dc0cd0cb5c365612ff4ac68e5fdf (patch) | |
| tree | ada0852c90995a5638d3670bad362afd8aede593 /include | |
| parent | 8a77080bc5a3b4ccea3bf3602e2596d1c91527cc (diff) | |
| parent | bc704dddb6d1239c55f6cd0f93d349f7cc3d1219 (diff) | |
| download | frameworks_base-b472798045c7dc0cd0cb5c365612ff4ac68e5fdf.zip frameworks_base-b472798045c7dc0cd0cb5c365612ff4ac68e5fdf.tar.gz frameworks_base-b472798045c7dc0cd0cb5c365612ff4ac68e5fdf.tar.bz2 | |
am bc704ddd: am 6feaa464: Enable passing parameters to the MediaWriter at runtime (at start() call).
Merge commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219'
* commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219':
Enable passing parameters to the MediaWriter at runtime (at start() call).
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AMRWriter.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MediaWriter.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/include/media/stagefright/AMRWriter.h b/include/media/stagefright/AMRWriter.h index b0eaba4..813dd43 100644 --- a/include/media/stagefright/AMRWriter.h +++ b/include/media/stagefright/AMRWriter.h @@ -26,6 +26,7 @@ namespace android { struct MediaSource; +struct MetaData; struct AMRWriter : public MediaWriter { AMRWriter(const char *filename); @@ -35,7 +36,7 @@ struct AMRWriter : public MediaWriter { virtual status_t addSource(const sp<MediaSource> &source); virtual bool reachedEOS(); - virtual status_t start(); + virtual status_t start(MetaData *params = NULL); virtual void stop(); virtual void pause(); diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 39d0ea1..7a2de1e 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -36,7 +36,7 @@ public: MPEG4Writer(int fd); virtual status_t addSource(const sp<MediaSource> &source); - virtual status_t start(); + virtual status_t start(MetaData *param = NULL); virtual bool reachedEOS(); virtual void stop(); virtual void pause(); @@ -83,6 +83,7 @@ private: int64_t getStartTimestampUs(); // Not const status_t startTracks(); size_t numTracks(); + int64_t estimateMoovBoxSize(int32_t bitRate); void lock(); void unlock(); diff --git a/include/media/stagefright/MediaWriter.h b/include/media/stagefright/MediaWriter.h index 8528203..46aaf7c 100644 --- a/include/media/stagefright/MediaWriter.h +++ b/include/media/stagefright/MediaWriter.h @@ -24,13 +24,14 @@ namespace android { struct MediaSource; +struct MetaData; struct MediaWriter : public RefBase { MediaWriter() {} virtual status_t addSource(const sp<MediaSource> &source) = 0; virtual bool reachedEOS() = 0; - virtual status_t start() = 0; + virtual status_t start(MetaData *params = NULL) = 0; virtual void stop() = 0; virtual void pause() = 0; virtual void setMaxFileSize(int64_t bytes) { mMaxFileSizeLimitBytes = bytes; } diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 6a20602..d28d1ca 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -36,13 +36,14 @@ enum { kKeyStride = 'strd', // int32_t kKeySliceHeight = 'slht', // int32_t kKeyChannelCount = '#chn', // int32_t - kKeySampleRate = 'srte', // int32_t + kKeySampleRate = 'srte', // int32_t (also video frame rate) kKeyBitRate = 'brte', // int32_t (bps) kKeyESDS = 'esds', // raw data kKeyAVCC = 'avcc', // raw data kKeyVorbisInfo = 'vinf', // raw data kKeyVorbisBooks = 'vboo', // raw data kKeyWantsNALFragments = 'NALf', + kKey64BitFileOffset = 'fobt', // int32_t (bool) kKeyIsSyncFrame = 'sync', // int32_t (bool) kKeyIsCodecConfig = 'conf', // int32_t (bool) kKeyTime = 'time', // int64_t (usecs) |