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

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

am 85bc1192: Merge "Workaround for preview frame rate setting and encoder... 

am 85bc1192: Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the def
parents 2130fc82 85bc1192

media/libmediaplayerservice/StagefrightRecorder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -584,8 +584,8 @@ status_t StagefrightRecorder::startMPEG4Recording() { 
        // Check on video frame rate

        int frameRate = newCameraParams.getPreviewFrameRate();

        if (frameRate < 0 || (frameRate - mFrameRate) != 0) {

            LOGE("Failed to set frame rate to %d", mFrameRate);

            return UNKNOWN_ERROR;

            LOGE("Failed to set frame rate to %d fps. The actual "

                 "frame rate is %d", mFrameRate, frameRate);

        }



        CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface));

media/libstagefright/OMXCodec.cpp

+0 −2
Original line number Diff line number Diff line
@@ -932,8 +932,6 @@ status_t OMXCodec::setupAVCEncoderParameters() { 
    h264type.bEnableFMO = OMX_FALSE;

    h264type.bEnableASO = OMX_FALSE;

    h264type.bEnableRS = OMX_FALSE;

    h264type.eProfile = OMX_VIDEO_AVCProfileBaseline;

    h264type.eLevel = OMX_VIDEO_AVCLevel1b;

    h264type.bFrameMBsOnly = OMX_TRUE;

    h264type.bMBAFF = OMX_FALSE;

    h264type.bEntropyCodingCABAC = OMX_FALSE;