diff options
| author | Tyler Luu <tluu@ti.com> | 2011-11-10 21:57:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 21:57:10 +0000 |
| commit | 44b70e321b11782413ac4f05a395e9d67e446099 (patch) | |
| tree | 4921bd61a61776f5033fdbb3859f2b7c9dc8c254 | |
| parent | 9a9de0756eba1917410dba8b4328c30c040b9836 (diff) | |
| parent | 656aec161f58f04742c6a0a9a64267f02c5285ed (diff) | |
| download | hardware_ti_omap4-44b70e321b11782413ac4f05a395e9d67e446099.zip hardware_ti_omap4-44b70e321b11782413ac4f05a395e9d67e446099.tar.gz hardware_ti_omap4-44b70e321b11782413ac4f05a395e9d67e446099.tar.bz2 | |
am 50f5c8a3: CameraHal: WA for green thumbnail for video snapshot
* commit '50f5c8a33223364870a21fb84eabe48c806697fd':
CameraHal: WA for green thumbnail for video snapshot
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index 6b09e17..10b7516 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -2969,7 +2969,11 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterFillBufferDone(OMX_IN OMX_HANDLE } ///Prepare the frames to be sent - initialize CameraFrame object and reference count - if( mWaitingForSnapshot && (mCapturedFrames > 0) && snapshotFrame ) + // TODO(XXX): ancillary data for snapshot frame is not being sent for video snapshot + // if we are waiting for a snapshot and in video mode...go ahead and send + // this frame as a snapshot + if( mWaitingForSnapshot && (mCapturedFrames > 0) && + (snapshotFrame || (mCapMode == VIDEO_MODE))) { typeOfFrame = CameraFrame::SNAPSHOT_FRAME; mask = (unsigned int)CameraFrame::SNAPSHOT_FRAME; |