From ec9e76f92155a454ab07ff2cdcbe20283613830d Mon Sep 17 00:00:00 2001 From: James Dong Date: Thu, 20 May 2010 11:56:06 -0700 Subject: [PATCH] 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 default level setting is changed. see bug - 2660974 Change-Id: Id01d94bb77dc242c4712d56a91b0d69a96ba6c2f --- media/libmediaplayerservice/StagefrightRecorder.cpp | 4 ++-- media/libstagefright/OMXCodec.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 8404779e1c10a..de647143fe352 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -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)); diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 33a118bc04200..928a6c832a902 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -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;