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

Commit cb51115c authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 5587bb7e: Merge "Interleave the audio and video by default - default... 

am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread

Merge commit '5587bb7e' into gingerbread-plus-aosp

* commit '5587bb7e':
  Interleave the audio and video by default
parents d3f6c1fa 5587bb7e

media/libmediaplayerservice/StagefrightRecorder.cpp

+4 −2
Original line number Diff line number Diff line
@@ -981,8 +981,10 @@ status_t StagefrightRecorder::startMPEG4Recording() { 
        totalBitRate += mVideoBitRate;

    }



    if (mInterleaveDurationUs > 0) {

        reinterpret_cast<MPEG4Writer *>(writer.get())->

            setInterleaveDuration(mInterleaveDurationUs);

    }



    if (mMaxFileDurationUs != 0) {

        writer->setMaxFileDuration(mMaxFileDurationUs);

media/libstagefright/MPEG4Writer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ MPEG4Writer::MPEG4Writer(const char *filename) 
      mOffset(0),

      mMdatOffset(0),

      mEstimatedMoovBoxSize(0),

      mInterleaveDurationUs(500000) {

      mInterleaveDurationUs(1000000) {

    CHECK(mFile != NULL);

}
@@ -157,7 +157,7 @@ MPEG4Writer::MPEG4Writer(int fd) 
      mOffset(0),

      mMdatOffset(0),

      mEstimatedMoovBoxSize(0),

      mInterleaveDurationUs(500000) {

      mInterleaveDurationUs(1000000) {

    CHECK(mFile != NULL);

}