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

Commit 3379c688 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "libstagefright: Remove assert failure for kKeyHfr" into ics

parents 76b2ec45 8c5ca9ed

media/libmediaplayerservice/StagefrightRecorder.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,10 @@ status_t StagefrightRecorder::setupVideoEncoder( 
    CHECK(meta->findInt32(kKeySliceHeight, &sliceHeight));

    CHECK(meta->findInt32(kKeyColorFormat, &colorFormat));

#ifdef QCOM_HARDWARE

    CHECK(meta->findInt32(kKeyHFR, &hfr));

    hfr = 0;

    if (!meta->findInt32(kKeyHFR, &hfr)) {

        LOGW("hfr not found, default to 0");

    }



    if(hfr) {

      mMaxFileDurationUs = mMaxFileDurationUs * (hfr/mFrameRate);

media/libstagefright/MPEG4Writer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1962,7 +1962,9 @@ status_t MPEG4Writer::Track::threadEntry() { 
          bool success = mMeta->findInt32(kKeySampleRate, &frameRate);

          CHECK(success);

          success = mMeta->findInt32(kKeyHFR, &hfr);

          CHECK(success);

          if (!success) {

              hfr = 0;

          }

          multiple = hfr?(hfr/frameRate):1;

          timestampUs = multiple * timestampUs;

        }