summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-01-09 22:48:22 -0800
committerLinux Build Service Account <lnxbuild@localhost>2019-01-09 22:48:22 -0800
commit3853cc83a73ac0fac77adac9ecba346e8731cc09 (patch)
tree4d36d64b0842eb6c8ea1fae4d851760047879181
parent39075a5313806d04207bcacdd93c6eaa36606f73 (diff)
parent5455b09e9e1d76cba58624934e639564222ac994 (diff)
downloadandroid_packages_apps_Snap-3853cc83a73ac0fac77adac9ecba346e8731cc09.zip
android_packages_apps_Snap-3853cc83a73ac0fac77adac9ecba346e8731cc09.tar.gz
android_packages_apps_Snap-3853cc83a73ac0fac77adac9ecba346e8731cc09.tar.bz2
Merge 5455b09e9e1d76cba58624934e639564222ac994 on remote branch
Change-Id: Ic2d394c5f6984c423412fa4284823c57db4af0fd
-rw-r--r--assets/dependency.json6
-rwxr-xr-xres/values/camera2arrays.xml2
-rwxr-xr-xres/values/qcomstrings.xml2
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java13
-rwxr-xr-xsrc/com/android/camera/SettingsManager.java6
-rwxr-xr-xversion.mk2
6 files changed, 20 insertions, 11 deletions
diff --git a/assets/dependency.json b/assets/dependency.json
index 2a63390..3ded5af 100644
--- a/assets/dependency.json
+++ b/assets/dependency.json
@@ -49,7 +49,8 @@
"pref_camera2_longshot_key":"off"}
,
"4":
- {"pref_camera2_coloreffect_key":"0"}
+ {"pref_camera2_coloreffect_key":"0",
+ "pref_camera2_zsl_key":"hal-zsl"}
,
"5":
{"pref_camera2_coloreffect_key":"0",
@@ -62,7 +63,8 @@
{"pref_camera2_coloreffect_key":"0"}
,
"10":
- {"pref_camera2_coloreffect_key":"0"}
+ {"pref_camera2_coloreffect_key":"0",
+ "pref_camera2_zsl_key":"hal-zsl"}
,
"13":
{"pref_camera2_coloreffect_key":"0"}
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index e053033..a75cf20 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -1146,12 +1146,14 @@ for time lapse recording -->
<item>@string/pref_camera2_eis_entry_disable</item>
<item>@string/pref_camera2_eis_entry_v2enable</item>
<item>@string/pref_camera2_eis_entry_v3enable</item>
+ <item>@string/pref_camera2_eis_entry_v3_set_when_pause</item>
</string-array>
<string-array name="pref_camera2_eis_entryvalues" translatable="false">
<item>@string/pref_camera2_eis_entry_value_disable</item>
<item>@string/pref_camera2_eis_entry_value_v2enable</item>
<item>@string/pref_camera2_eis_entry_value_v3enable</item>
+ <item>@string/pref_camera2_eis_entry_value_v3_set_when_pause</item>
</string-array>
<string-array name="pref_camera2_fovc_entries" translatable="false">
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 8d12e70..dfe75c8 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1239,9 +1239,11 @@
<string name="pref_camera2_eis_default" translatable="false">disable</string>
<string name="pref_camera2_eis_entry_v2enable" translatable="false">V2</string>
<string name="pref_camera2_eis_entry_v3enable" translatable="false">V3</string>
+ <string name="pref_camera2_eis_entry_v3_set_when_pause" translatable="false">V3 and set when pause</string>
<string name="pref_camera2_eis_entry_disable" translatable="false">disable</string>
<string name="pref_camera2_eis_entry_value_v2enable" translatable="false">V2</string>
<string name="pref_camera2_eis_entry_value_v3enable" translatable="false">V3</string>
+ <string name="pref_camera2_eis_entry_value_v3_set_when_pause" translatable="false">V3SetWhenPause</string>
<string name="pref_camera2_eis_entry_value_disable" translatable="false">disable</string>
<string name="pref_camera2_fovc_title" translatable="true">Video FOVC</string>
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 7b5403f..cf5ebdb 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4305,6 +4305,7 @@ public class CaptureModule implements CameraModule, PhotoController,
requestAudioFocus();
try {
mMediaRecorder.start(); // Recording is now started
+ Log.d(TAG, "StartRecordingVideo done.");
} catch (RuntimeException e) {
Toast.makeText(mActivity,"Could not start media recorder.\n " +
"Can't start video recording.", Toast.LENGTH_LONG).show();
@@ -4586,9 +4587,14 @@ public class CaptureModule implements CameraModule, PhotoController,
Log.v(TAG, "pauseVideoRecording");
mMediaRecorderPausing = true;
mRecordingTotalTime += SystemClock.uptimeMillis() - mRecordingStartTime;
+ String value = mSettingsManager.getValue(SettingsManager.KEY_EIS_VALUE);
+ boolean noNeedEndofStreamWhenPause = value != null && value.equals("V3");
// As EIS is not supported for HFR case (>=120 )
// and FOVC also currently don’t require this for >=120 case
- if (mHighSpeedCapture && ((int)mHighSpeedFPSRange.getUpper() >= HIGH_SESSION_MAX_FPS)) {
+ // so use noNeedEndOfStreamInHFR to control
+ boolean noNeedEndOfStreamInHFR = mHighSpeedCapture &&
+ ((int)mHighSpeedFPSRange.getUpper() >= HIGH_SESSION_MAX_FPS);
+ if (noNeedEndofStreamWhenPause || noNeedEndOfStreamInHFR) {
mMediaRecorder.pause();
} else {
setEndOfStream(false, false);
@@ -4603,6 +4609,7 @@ public class CaptureModule implements CameraModule, PhotoController,
setEndOfStream(true, false);
if (!ApiHelper.HAS_RESUME_SUPPORTED){
mMediaRecorder.start();
+ Log.d(TAG, "StartRecordingVideo done.");
} else {
try {
Method resumeRec = Class.forName("android.media.MediaRecorder").getMethod("resume");
@@ -4625,7 +4632,7 @@ public class CaptureModule implements CameraModule, PhotoController,
}
} else {
// is pause or stopRecord
- if (!(mMediaRecorderPausing && mStopRecPending) && (mCurrentSession != null)) {
+ if ((mMediaRecorderPausing || mStopRecPending) && (mCurrentSession != null)) {
mCurrentSession.stopRepeating();
try {
mVideoRequestBuilder.set(CaptureModule.recording_end_stream, (byte) 0x01);
@@ -5286,7 +5293,7 @@ public class CaptureModule implements CameraModule, PhotoController,
if (value != null) {
if (value.equals("V2")) {
mStreamConfigOptMode = STREAM_CONFIG_MODE_QTIEIS_REALTIME;
- } else if (value.equals("V3")) {
+ } else if (value.equals("V3") || value.equals("V3SetWhenPause")) {
mStreamConfigOptMode = STREAM_CONFIG_MODE_QTIEIS_LOOKAHEAD;
}
byte byteValue = (byte) (value.equals("disable") ? 0x00 : 0x01);
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 08488c9..b62573b 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -1756,11 +1756,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
public boolean isZSLInAppEnabled(){
String value = getValue(KEY_ZSL);
String appZSLValue = mContext.getString(R.string.pref_camera2_zsl_entryvalue_app_zsl);
- if ( (value != null && value.equals(appZSLValue)) ||
- SettingsManager.SCENE_MODE_SUNSET_STRING.equals(
- SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE)) ||
- SettingsManager.SCENE_MODE_LANDSCAPE_STRING.equals(
- SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE))){
+ if ( value != null && value.equals(appZSLValue)){
return true;
}else{
return false;
diff --git a/version.mk b/version.mk
index 2ae76a3..ae04a1a 100755
--- a/version.mk
+++ b/version.mk
@@ -40,7 +40,7 @@
# base_version_build is 3 digits and auto-increment for fixing CR.
base_version_major := 2
base_version_minor := 02
-base_version_build := 014
+base_version_build := 015
#####################################################
#####################################################