diff options
author | Camera Software Integration <camswint@quicinc.com> | 2019-11-01 13:15:58 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-01 13:15:58 -0700 |
commit | bb8d43b322ba91f4096d8736aebf42bc8d451640 (patch) | |
tree | a5f0006f8c3953df216d3e3e86e43343faaa0c36 /src/com/android/camera | |
parent | 7ead6d85d166dcee18d7007aba708c0c0e6d4bc9 (diff) | |
parent | c058e3fdfeda1c9836024ce135e567186bfeac35 (diff) | |
download | android_packages_apps_Snap-bb8d43b322ba91f4096d8736aebf42bc8d451640.tar.gz android_packages_apps_Snap-bb8d43b322ba91f4096d8736aebf42bc8d451640.tar.bz2 android_packages_apps_Snap-bb8d43b322ba91f4096d8736aebf42bc8d451640.zip |
Merge "SnapdragonCamera: Disable MPEG4 when enable EIS and less 720P" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com/android/camera')
-rwxr-xr-x | src/com/android/camera/SettingsActivity.java | 6 | ||||
-rwxr-xr-x | src/com/android/camera/SettingsManager.java | 20 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index ae7b48293..3fef92493 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -159,6 +159,12 @@ public class SettingsActivity extends PreferenceActivity { if ( (pref.getKey().equals(SettingsManager.KEY_MANUAL_WB)) ) { updateManualWBSettings(); } + + if (pref.getKey().equals(SettingsManager.KEY_VIDEO_QUALITY) || + pref.getKey().equals(SettingsManager.KEY_DIS) || + pref.getKey().equals(SettingsManager.KEY_EIS_VALUE)) { + updatePreference(SettingsManager.KEY_VIDEO_ENCODER); + } } } }; diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 88fe2ec53..9f42e7c6a 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1091,6 +1091,9 @@ public class SettingsManager implements ListMenu.SettingsListener { filterVideoEncoderProfileOptions(); } else if (pref.getKey().equals(KEY_PICTURE_FORMAT)) { filterHeifSizeOptions(); + } else if (pref.getKey().equals(KEY_DIS) || + pref.getKey().equals(KEY_EIS_VALUE)) { + filterVideoEncoderOptions(); } } @@ -1979,6 +1982,23 @@ public class SettingsManager implements ListMenu.SettingsListener { } } } + + ListPreference videoQuality = mPreferenceGroup.findPreference(KEY_VIDEO_QUALITY); + String videoSize = videoQuality.getValue(); + int indexX = videoSize.indexOf('x'); + int width = Integer.parseInt(videoSize.substring(0, indexX)); + int height = Integer.parseInt(videoSize.substring(indexX + 1)); + // Video quality less than 720P + boolean isLess720P = width < 1280 && height < 720; + + ListPreference disPref = mPreferenceGroup.findPreference(KEY_DIS); + ListPreference eisPref = mPreferenceGroup.findPreference(KEY_EIS_VALUE); + if (isLess720P && + "on".equals(disPref.getValue()) && + !("disable".equals(eisPref.getValue()))) { + supported.remove("mpeg-4-sp"); + } + return supported; } |