diff options
| author | Shwetha Kotekar <skotekar@codeaurora.org> | 2015-03-10 13:36:06 -0700 |
|---|---|---|
| committer | Shwetha Kotekar <skotekar@codeaurora.org> | 2015-03-10 13:36:06 -0700 |
| commit | a4e4bd59379df3b475a80674abac1d1314ba347d (patch) | |
| tree | b1880bd60f4f4f438d7066f8e047217a1c4c710b /src | |
| parent | 08f34cd0d9f835ad9c7ec524de740b7710b483f1 (diff) | |
| download | android_packages_apps_Snap-a4e4bd59379df3b475a80674abac1d1314ba347d.tar.gz android_packages_apps_Snap-a4e4bd59379df3b475a80674abac1d1314ba347d.tar.bz2 android_packages_apps_Snap-a4e4bd59379df3b475a80674abac1d1314ba347d.zip | |
SnapdragonCamera: Disable CDS and TNR if SeeMore is enabled
If seeMore is enabled, send a disable command to HAL
to disable the CDS and TNR features.
Change-Id: I91bac0a01c58cb13ba32296739b47f74dc296003
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 68 |
1 files changed, 48 insertions, 20 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 42268e9e3..17b8ce1ce 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2063,26 +2063,6 @@ public class VideoModule implements CameraModule, } Log.d(TAG, "antiBanding value = " + mParameters.getAntibanding()); - String seeMoreMode = mPreferences.getString( - CameraSettings.KEY_SEE_MORE, - mActivity.getString(R.string.pref_camera_see_more_default)); - Log.v(TAG, "See More value =" + seeMoreMode); - - if (isSupported(seeMoreMode, - CameraSettings.getSupportedSeeMoreModes(mParameters))) { - if (is4KEnabled() && seeMoreMode.equals(mActivity.getString(R.string. - pref_camera_see_more_value_on))) { - mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, - mActivity.getString(R.string.pref_camera_see_more_value_off)); - mUI.overrideSettings(CameraSettings.KEY_SEE_MORE, - mActivity.getString(R.string.pref_camera_see_more_value_off)); - Toast.makeText(mActivity, R.string.video_quality_4k_disable_SeeMore, - Toast.LENGTH_LONG).show(); - } else { - mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode); - } - } - mUnsupportedHFRVideoSize = false; mUnsupportedHFRVideoCodec = false; mUnsupportedHSRVideoSize = false; @@ -2247,6 +2227,54 @@ public class VideoModule implements CameraModule, mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE, video_tnr); } + String seeMoreMode = mPreferences.getString( + CameraSettings.KEY_SEE_MORE, + mActivity.getString(R.string.pref_camera_see_more_default)); + Log.v(TAG, "See More value =" + seeMoreMode); + + if (isSupported(seeMoreMode, + CameraSettings.getSupportedSeeMoreModes(mParameters))) { + if (is4KEnabled() && seeMoreMode.equals(mActivity.getString(R.string. + pref_camera_see_more_value_on))) { + /* Disable SeeMore during 4K resolution */ + mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, + mActivity.getString(R.string.pref_camera_see_more_value_off)); + mUI.overrideSettings(CameraSettings.KEY_SEE_MORE, + mActivity.getString(R.string.pref_camera_see_more_value_off)); + Toast.makeText(mActivity, R.string.video_quality_4k_disable_SeeMore, + Toast.LENGTH_LONG).show(); + } else { + /* Disable CDS */ + if (seeMoreMode.equals( + mActivity.getString(R.string.pref_camera_see_more_value_on)) && + video_cds.equals(mActivity.getString(R.string. + pref_camera_video_cds_value_on))) { + mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE, + mActivity.getString(R.string.pref_camera_video_cds_value_off)); + mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE, + mActivity.getString(R.string.pref_camera_video_cds_value_off)); + Toast.makeText(mActivity, R.string.disable_CDS_during_SeeMore, + Toast.LENGTH_LONG).show(); + } + + /* Disable TNR */ + if (seeMoreMode.equals( + mActivity.getString(R.string.pref_camera_see_more_value_on)) && + video_tnr.equals(mActivity.getString(R.string. + pref_camera_video_tnr_value_on))) { + mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE, + mActivity.getString(R.string.pref_camera_video_tnr_value_off)); + mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE, + mActivity.getString(R.string.pref_camera_video_tnr_value_off)); + Toast.makeText(mActivity, R.string.disable_TNR_during_SeeMore, + Toast.LENGTH_LONG).show(); + } + + /* Set SeeMore mode */ + mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode); + } + } + // Set Video HDR. String videoHDR = mPreferences.getString( CameraSettings.KEY_VIDEO_HDR, |