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

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

Merge "When Camera is launched by media recording framework, stagefright... 

Merge "When Camera is launched by media recording framework, stagefright controls the stop and release."
parents a81fe3bb 83122781

media/libstagefright/CameraSource.cpp

+9 −0
Original line number Diff line number Diff line
@@ -635,6 +635,12 @@ status_t CameraSource::stop() { 
    mStarted = false;

    mFrameAvailableCondition.signal();



    int64_t token;

    bool isTokenValid = false;

    if (mCamera != 0) {

        token = IPCThreadState::self()->clearCallingIdentity();

        isTokenValid = true;

    }

    releaseQueuedFrames();

    while (!mFramesBeingEncoded.empty()) {

        if (NO_ERROR !=
@@ -645,6 +651,9 @@ status_t CameraSource::stop() { 
    }

    stopCameraRecording();

    releaseCamera();

    if (isTokenValid) {

        IPCThreadState::self()->restoreCallingIdentity(token);

    }



    if (mCollectStats) {

        LOGI("Frames received/encoded/dropped: %d/%d/%d in %lld us",