diff options
| author | Deva Ramasubramanian <dramasub@codeaurora.org> | 2015-11-09 18:55:59 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-04-13 13:54:55 -0700 |
| commit | 322d0a4dd98eae78c0f0acbebc2b622be9fd5438 (patch) | |
| tree | cebe390e9f518f712f391deb3e7456037754a408 /media/libstagefright | |
| parent | d38f17584c22d77b8b0bac85279ce72e1576c34c (diff) | |
| download | frameworks_av-322d0a4dd98eae78c0f0acbebc2b622be9fd5438.zip frameworks_av-322d0a4dd98eae78c0f0acbebc2b622be9fd5438.tar.gz frameworks_av-322d0a4dd98eae78c0f0acbebc2b622be9fd5438.tar.bz2 | |
libstagefright: Allow for MPEG4Writer extension
Defer MPEG4 muxer creation to AVFactory.
Change-Id: If0918be77ab7f8d82c78203f371df789e3cc29b8
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/MediaMuxer.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index f5e0fbf..24da000 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -1148,7 +1148,7 @@ off64_t MPEG4Writer::addSample_l(MediaBuffer *buffer) { return old_offset; } -static void StripStartcode(MediaBuffer *buffer) { +void MPEG4Writer::StripStartcode(MediaBuffer *buffer) { if (buffer->range_length() < 4) { return; } diff --git a/media/libstagefright/MediaMuxer.cpp b/media/libstagefright/MediaMuxer.cpp index b13877d..798a855 100644 --- a/media/libstagefright/MediaMuxer.cpp +++ b/media/libstagefright/MediaMuxer.cpp @@ -35,6 +35,7 @@ #include <media/stagefright/MetaData.h> #include <media/stagefright/MPEG4Writer.h> #include <media/stagefright/Utils.h> +#include <stagefright/AVExtensions.h> namespace android { @@ -42,7 +43,7 @@ MediaMuxer::MediaMuxer(int fd, OutputFormat format) : mFormat(format), mState(UNINITIALIZED) { if (format == OUTPUT_FORMAT_MPEG_4) { - mWriter = new MPEG4Writer(fd); + mWriter = AVFactory::get()->CreateMPEG4Writer(fd); } else if (format == OUTPUT_FORMAT_WEBM) { mWriter = new WebmWriter(fd); } |