summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxianming wang <mingwax@codeaurora.org>2018-04-02 17:59:26 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-04-09 18:28:24 -0700
commit1eff55c0639910a06c012e71229889c647c9ca8a (patch)
tree51f414f1685e75a68ab6b8cac4da186c9bb41bac
parent3cfcf4eeddc209785e2c99aa7be9fc7abfdefe68 (diff)
downloadandroid_packages_apps_Snap-1eff55c0639910a06c012e71229889c647c9ca8a.tar.gz
android_packages_apps_Snap-1eff55c0639910a06c012e71229889c647c9ca8a.tar.bz2
android_packages_apps_Snap-1eff55c0639910a06c012e71229889c647c9ca8a.zip
SnapdragonCamera: Add support ZZHDR configuration of the stream
Add support the ZZHDR configuration of the stream. CRs-Fixed: 2217939 Change-Id: Ia3c0de968644e77adb45b3a2b7dfd0a2af7d7304
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index d075ed10f..1196f3c29 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -214,6 +214,7 @@ public class CaptureModule implements CameraModule, PhotoController,
private static final int STREAM_CONFIG_MODE_QTIEIS_REALTIME = 0xF004;
private static final int STREAM_CONFIG_MODE_QTIEIS_LOOKAHEAD = 0xF008;
private static final int STREAM_CONFIG_MODE_FOVC = 0xF010;
+ private static final int STREAM_CONFIG_MODE_ZZHDR = 0xF002;
public static final boolean DEBUG =
(PersistUtil.getCamera2Debug() == PersistUtil.CAMERA2_DEBUG_DUMP_LOG) ||
@@ -3783,11 +3784,19 @@ public class CaptureModule implements CameraModule, PhotoController,
}, null);
} else {
surfaces.add(mVideoSnapshotImageReader.getSurface());
- setOpModeForVideoStream(cameraId);
+ String zzHDR = mSettingsManager.getValue(SettingsManager.KEY_VIDEO_HDR_VALUE);
+ boolean zzHdrStatue = zzHDR.equals("1");
+ // if enable ZZHDR mode, don`t call the setOpModeForVideoStream method.
+ if (!zzHdrStatue) {
+ setOpModeForVideoStream(cameraId);
+ }
String value = mSettingsManager.getValue(SettingsManager.KEY_FOVC_VALUE);
if (value != null && Boolean.parseBoolean(value)) {
mStreamConfigOptMode = mStreamConfigOptMode | STREAM_CONFIG_MODE_FOVC;
}
+ if (zzHdrStatue) {
+ mStreamConfigOptMode = STREAM_CONFIG_MODE_ZZHDR;
+ }
if (DEBUG) {
Log.v(TAG, "createCustomCaptureSession mStreamConfigOptMode :"
+ mStreamConfigOptMode);