diff options
| author | James Dong <jdong@google.com> | 2010-05-20 12:21:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-20 12:21:13 -0700 |
| commit | 3ba577e65324ea0d0e33517cd07d0e34aa009bda (patch) | |
| tree | 950d51c55961df58e13a69c000b6253ff0ed3f6f | |
| parent | 422017be6847d52db9cbfe78816c0b4d982b9fc8 (diff) | |
| parent | 91b9e5fb718532de72b99d4d757305de5c406da1 (diff) | |
| download | frameworks_base-3ba577e65324ea0d0e33517cd07d0e34aa009bda.zip frameworks_base-3ba577e65324ea0d0e33517cd07d0e34aa009bda.tar.gz frameworks_base-3ba577e65324ea0d0e33517cd07d0e34aa009bda.tar.bz2 | |
am 91b9e5fb: 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 buffe
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 4 | ||||
| -rw-r--r-- | 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 8404779..de64714 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 33a118b..928a6c8 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; |