summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjinwu <jinwu@codeaurora.org>2019-11-28 15:54:16 +0800
committerjinwu <jinwu@codeaurora.org>2019-11-28 15:54:16 +0800
commit4a47aa1b2e601913a4ec97838ec64c445fec4872 (patch)
treebbd372d3f1323aa7d28ddc82214ee58012a1ea13
parentf3b7cacf2b53b3239fc29ffddc2028be6dba89a2 (diff)
downloadandroid_packages_apps_Snap-4a47aa1b2e601913a4ec97838ec64c445fec4872.zip
android_packages_apps_Snap-4a47aa1b2e601913a4ec97838ec64c445fec4872.tar.gz
android_packages_apps_Snap-4a47aa1b2e601913a4ec97838ec64c445fec4872.tar.bz2
Fix issue of updating Flash in HFR
It doesn't allow to change requests batch in high speed session, so when update flash mode in HFR, it should still send preview and video requests together. Change-Id: Id4092acca15e2bf465f1ebd632f2fa4799567594
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index d4db0b7..6d85ca3 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -5042,17 +5042,16 @@ public class CaptureModule implements CameraModule, PhotoController,
applyVideoFlash(mVideoPausePreviewRequestBuilder);
CaptureRequest captureRequest = null;
try {
- if (mMediaRecorderPausing) {
- captureRequest = mVideoPausePreviewRequestBuilder.build();
- } else {
- captureRequest = mVideoRequestBuilder.build();
- }
+ captureRequest = mVideoRequestBuilder.build();
if (mCurrentSession instanceof CameraConstrainedHighSpeedCaptureSession) {
CameraConstrainedHighSpeedCaptureSession session =
(CameraConstrainedHighSpeedCaptureSession) mCurrentSession;
List requestList = session.createHighSpeedRequestList(captureRequest);
session.setRepeatingBurst(requestList, mCaptureCallback, mCameraHandler);
} else {
+ if (mMediaRecorderPausing) {
+ captureRequest = mVideoPausePreviewRequestBuilder.build();
+ }
mCurrentSession.setRepeatingRequest(captureRequest, mCaptureCallback,
mCameraHandler);
}