diff options
| author | Tyler Luu <tluu@ti.com> | 2011-11-10 22:00:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 22:00:08 +0000 |
| commit | 4af498f202fca733a35d8c94466db54ff2786337 (patch) | |
| tree | 27a867d929a1595343fb01574ff1e283b0223c2a | |
| parent | dd984e135dcc280730ae9be189f073f4a47bec9c (diff) | |
| parent | 17b202ccde6b468bd9f70fbd075a45d12f5cd92a (diff) | |
| download | hardware_ti_omap4-4af498f202fca733a35d8c94466db54ff2786337.zip hardware_ti_omap4-4af498f202fca733a35d8c94466db54ff2786337.tar.gz hardware_ti_omap4-4af498f202fca733a35d8c94466db54ff2786337.tar.bz2 | |
am 8a2c7a2d: am 8eedae16: am 50f5c8a3: CameraHal: WA for green thumbnail for video snapshot
* commit '8a2c7a2d44408aea33beef1775c7b925211d1aae':
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 1fa1607..b0e1088 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; |