diff options
| author | James Dong <jdong@google.com> | 2012-05-15 17:24:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-15 17:24:27 -0700 |
| commit | 50a9908f987fd5a73d8a95d6fe46b530386cdc86 (patch) | |
| tree | 9f9444db2cdb8dac16daa9527f8888b169a0ca81 /include | |
| parent | 09effe3813dcdec19c6767bf754cc3834e816937 (diff) | |
| parent | 8c460498c028888c533ab442be12b6d4b669b965 (diff) | |
| download | frameworks_av-50a9908f987fd5a73d8a95d6fe46b530386cdc86.zip frameworks_av-50a9908f987fd5a73d8a95d6fe46b530386cdc86.tar.gz frameworks_av-50a9908f987fd5a73d8a95d6fe46b530386cdc86.tar.bz2 | |
Merge "Speed up stsz box write in MPEG4Writer" into jb-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 0409b30..cd4e129 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -50,6 +50,7 @@ public: void writeCString(const char *s); void writeFourcc(const char *fourcc); void write(const void *data, size_t size); + inline size_t write(const void *ptr, size_t size, size_t nmemb); void endBox(); uint32_t interleaveDuration() const { return mInterleaveDurationUs; } status_t setInterleaveDuration(uint32_t duration); @@ -168,7 +169,6 @@ private: off64_t addSample_l(MediaBuffer *buffer); off64_t addLengthPrefixedSample_l(MediaBuffer *buffer); - inline size_t write(const void *ptr, size_t size, size_t nmemb); bool exceedsFileSizeLimit(); bool use32BitFileOffset() const; bool exceedsFileDurationLimit(); |