Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 default level setting is changed. see bug - 2660974" into kraken

Browse Source
This commit is contained in:
James Dong
2010-05-20 12:18:39 -07:00
committed by Android (Google) Code Review
parent c6a1632732 ec9e76f921
commit 85bc1192ce
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@@ -584,8 +584,8 @@ status_t StagefrightRecorder::startMPEG4Recording() {
// Check on video frame rate // Check on video frame rate
int frameRate = newCameraParams.getPreviewFrameRate(); int frameRate = newCameraParams.getPreviewFrameRate();
if (frameRate < 0 || (frameRate - mFrameRate) != 0) { if (frameRate < 0 || (frameRate - mFrameRate) != 0) {
LOGE("Failed to set frame rate to %d", mFrameRate); LOGE("Failed to set frame rate to %d fps. The actual "
return UNKNOWN_ERROR; "frame rate is %d", mFrameRate, frameRate);
} }
CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface)); CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface));

2
media/libstagefright/OMXCodec.cpp
View File

@@ -932,8 +932,6 @@ status_t OMXCodec::setupAVCEncoderParameters() {
h264type.bEnableFMO = OMX_FALSE; h264type.bEnableFMO = OMX_FALSE;
h264type.bEnableASO = OMX_FALSE; h264type.bEnableASO = OMX_FALSE;
h264type.bEnableRS = OMX_FALSE; h264type.bEnableRS = OMX_FALSE;
h264type.eProfile = OMX_VIDEO_AVCProfileBaseline;
h264type.eLevel = OMX_VIDEO_AVCLevel1b;
h264type.bFrameMBsOnly = OMX_TRUE; h264type.bFrameMBsOnly = OMX_TRUE;
h264type.bMBAFF = OMX_FALSE; h264type.bMBAFF = OMX_FALSE;
h264type.bEntropyCodingCABAC = OMX_FALSE; h264type.bEntropyCodingCABAC = OMX_FALSE;