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

Commit 59f0262a authored by Greg Kaiser's avatar Greg Kaiser
Browse files

MPEG4Extractor: Make code more clear 

We were taking the exact same action whether or not the
'Present' bit was set.  So we make the code more clear
that this is what we're doing.  We also add logging,
in verbose logging only, if we get the unexpected case
of the 'Present' bit not being set.

Bug: 77714339
Test: TreeHugger
Change-Id: I58c5f5bb01e2b307b5943ae43c6d685cf96f5477
parent 3ee6b7a5

media/extractors/mp4/MPEG4Extractor.cpp

+16 −6
Original line number Diff line number Diff line
@@ -5236,20 +5236,30 @@ status_t MPEG4Source::parseTrackFragmentRun(off64_t offset, off64_t size) { 


    if (flags & kSampleSizePresent) {

        bytesPerSample += 4;

    } else if (mTrackFragmentHeaderInfo.mFlags

            & TrackFragmentHeaderInfo::kDefaultSampleSizePresent) {

        sampleSize = mTrackFragmentHeaderInfo.mDefaultSampleSize;

    } else {

        sampleSize = mTrackFragmentHeaderInfo.mDefaultSampleSize;

#ifdef VERY_VERY_VERBOSE_LOGGING

        // We don't expect this, but also want to avoid spamming the log if

        // we hit this case.

        if (!(mTrackFragmentHeaderInfo.mFlags

              & TrackFragmentHeaderInfo::kDefaultSampleSizePresent)) {

            ALOGW("No sample size specified");

        }

#endif

    }



    if (flags & kSampleFlagsPresent) {

        bytesPerSample += 4;

    } else if (mTrackFragmentHeaderInfo.mFlags

            & TrackFragmentHeaderInfo::kDefaultSampleFlagsPresent) {

        sampleFlags = mTrackFragmentHeaderInfo.mDefaultSampleFlags;

    } else {

        sampleFlags = mTrackFragmentHeaderInfo.mDefaultSampleFlags;

#ifdef VERY_VERY_VERBOSE_LOGGING

        // We don't expect this, but also want to avoid spamming the log if

        // we hit this case.

        if (!(mTrackFragmentHeaderInfo.mFlags

              & TrackFragmentHeaderInfo::kDefaultSampleFlagsPresent)) {

            ALOGW("No sample flags specified");

        }

#endif

    }



    if (flags & kSampleCompositionTimeOffsetPresent) {