diff options
| author | jinwu <jinwu@codeaurora.org> | 2017-10-23 18:55:27 +0800 |
|---|---|---|
| committer | jinwu <jinwu@codeaurora.org> | 2017-11-03 15:40:20 +0800 |
| commit | 92d544bceec39e75ea43b74bb46f0a94537fec2a (patch) | |
| tree | 8726c8a842e8a5f098871b092912b51b89c9f1c3 | |
| parent | fb7ebd8f0470282ef455eb0a1b225e38c7333d03 (diff) | |
| download | android_packages_apps_Snap-92d544bceec39e75ea43b74bb46f0a94537fec2a.tar.gz android_packages_apps_Snap-92d544bceec39e75ea43b74bb46f0a94537fec2a.tar.bz2 android_packages_apps_Snap-92d544bceec39e75ea43b74bb46f0a94537fec2a.zip | |
Support HLG and HDR10
Send only Main10HDR10 profile.
Change-Id: I06e9e8c6d12bb88e471a712cec3a05b78ab4f168
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 16 | ||||
| -rw-r--r-- | src/com/android/camera/util/SettingTranslation.java | 2 | ||||
| -rwxr-xr-x | version.mk | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 1e2037e56..06d1974f0 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3372,17 +3372,14 @@ public class CaptureModule implements CameraModule, PhotoController, } private void applyVideoEncoderProfile(CaptureRequest.Builder builder) { - int profile = SettingTranslation.getVideoEncoderProfile( - mSettingsManager.getValue(SettingsManager.KEY_VIDEO_ENCODER_PROFILE)); + String profile = mSettingsManager.getValue(SettingsManager.KEY_VIDEO_ENCODER_PROFILE); int mode = 0; - switch(profile) { - case MediaCodecInfo.CodecProfileLevel.HEVCProfileMain10: - mode = 1; - break; - case MediaCodecInfo.CodecProfileLevel.HEVCProfileMain10HDR10: - mode = 2; - break; + if (profile.equals("HEVCProfileMain10HDR10")) { + mode = 2; + } else if (profile.equals("HEVCProfileMain10")) { + mode = 1; } + Log.d(TAG, "setHDRVideoMode: " + mode); VendorTagUtil.setHDRVideoMode(builder, (byte)mode); } @@ -3658,6 +3655,7 @@ public class CaptureModule implements CameraModule, PhotoController, && VendorTagUtil.isHDRVideoModeSupported(mCameraDevice[cameraId])) { int videoEncoderProfile = SettingTranslation.getVideoEncoderProfile( mSettingsManager.getValue(SettingsManager.KEY_VIDEO_ENCODER_PROFILE)); + Log.d(TAG, "setVideoEncodingProfileLevel: " + videoEncoderProfile + " " + MediaCodecInfo.CodecProfileLevel.HEVCMainTierLevel1); mMediaRecorder.setVideoEncodingProfileLevel(videoEncoderProfile, MediaCodecInfo.CodecProfileLevel.HEVCMainTierLevel1); } diff --git a/src/com/android/camera/util/SettingTranslation.java b/src/com/android/camera/util/SettingTranslation.java index 2151f66e0..4fd995248 100644 --- a/src/com/android/camera/util/SettingTranslation.java +++ b/src/com/android/camera/util/SettingTranslation.java @@ -73,7 +73,7 @@ public class SettingTranslation { .NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG); VIDEO_ENCODER_PROFILE_TABLE.put("HEVCProfileMain10", - MediaCodecInfo.CodecProfileLevel.HEVCProfileMain10); + MediaCodecInfo.CodecProfileLevel.HEVCProfileMain10HDR10); VIDEO_ENCODER_PROFILE_TABLE.put("HEVCProfileMain10HDR10", MediaCodecInfo.CodecProfileLevel.HEVCProfileMain10HDR10); } diff --git a/version.mk b/version.mk index 72d816f49..0b6e7f430 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 := 00 -base_version_build := 005 +base_version_build := 006 ##################################################### ##################################################### |