Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cd68527 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev 

* commit '41688da2':
  MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
parents 197d3e07 41688da2

include/media/stagefright/MediaMuxer.h

+0 −6
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ struct MPEG4Writer; 
// deleting the output file after stop.

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 {

media/libstagefright/MediaMuxer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }