diff options
| author | Lajos Molnar <lajos@google.com> | 2013-05-29 19:11:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-29 19:11:25 +0000 |
| commit | 41688da226e91c97ea3b2fe096044e1e5b0520bc (patch) | |
| tree | 3400fb46bc247f96d17b17463955ebbff1dd0e7b | |
| parent | 3c89a2e9d4ee10b9e955783af2ab9e9dd137922f (diff) | |
| parent | 6f505a4c0b91d88d2759fbd7e17d91f3ed715165 (diff) | |
| download | frameworks_av-41688da226e91c97ea3b2fe096044e1e5b0520bc.zip frameworks_av-41688da226e91c97ea3b2fe096044e1e5b0520bc.tar.gz frameworks_av-41688da226e91c97ea3b2fe096044e1e5b0520bc.tar.bz2 | |
Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
| -rw-r--r-- | include/media/stagefright/MediaMuxer.h | 6 | ||||
| -rw-r--r-- | media/libstagefright/MediaMuxer.cpp | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/media/stagefright/MediaMuxer.h b/include/media/stagefright/MediaMuxer.h index fad319f..c1fdbad 100644 --- a/include/media/stagefright/MediaMuxer.h +++ b/include/media/stagefright/MediaMuxer.h @@ -41,12 +41,6 @@ struct MPEG4Writer; struct MediaMuxer : public RefBase { public: // Please update media/java/android/media/MediaMuxer.java if the - // SampleFlags is updated. - enum SampleFlags { - SAMPLE_FLAG_SYNC = 1, - }; - - // Please update media/java/android/media/MediaMuxer.java if the // OutputFormat is updated. enum OutputFormat { OUTPUT_FORMAT_MPEG_4 = 0, diff --git a/media/libstagefright/MediaMuxer.cpp b/media/libstagefright/MediaMuxer.cpp index 388c65b..94ce5de 100644 --- a/media/libstagefright/MediaMuxer.cpp +++ b/media/libstagefright/MediaMuxer.cpp @@ -161,7 +161,7 @@ status_t MediaMuxer::writeSampleData(const sp<ABuffer> &buffer, size_t trackInde // Just set the kKeyDecodingTime as the presentation time for now. sampleMetaData->setInt64(kKeyDecodingTime, timeUs); - if (flags & SAMPLE_FLAG_SYNC) { + if (flags & MediaCodec::BUFFER_FLAG_SYNCFRAME) { sampleMetaData->setInt32(kKeyIsSyncFrame, true); } |