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

Commit abcd31d6 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Add timestamp and data pointer checks in CameraSource"

parents 6ad97c72 98cfde00

media/libstagefright/CameraSource.cpp

+5 −5
Original line number Diff line number Diff line
@@ -701,13 +701,12 @@ void CameraSource::dataCallbackTimestamp(int64_t timestampUs, 
        return;

    }



    if (mNumFramesReceived > 0 &&

        timestampUs - mLastFrameTimestampUs > mGlitchDurationThresholdUs) {

        if (mNumGlitches % 10 == 0) {  // Don't spam the log

            LOGV("Long delay detected in video recording");

        }

    if (mNumFramesReceived > 0) {

        CHECK(timestampUs > mLastFrameTimestampUs);

        if (timestampUs - mLastFrameTimestampUs > mGlitchDurationThresholdUs) {

            ++mNumGlitches;

        }

    }



    // May need to skip frame or modify timestamp. Currently implemented

    // by the subclass CameraSourceTimeLapse.
@@ -732,6 +731,7 @@ void CameraSource::dataCallbackTimestamp(int64_t timestampUs, 
    }

    ++mNumFramesReceived;



    CHECK(data != NULL && data->size() > 0);

    mFramesReceived.push_back(data);

    int64_t timeUs = mStartTimeUs + (timestampUs - mFirstFrameTimeUs);

    mFrameTimes.push_back(timeUs);