diff options
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r-- | src/com/android/camera/VideoModule.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index cfca4d671..28c62f360 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -306,7 +306,8 @@ public class VideoModule implements CameraModule, VIDEO_ENCODER_TABLE.put("h263", MediaRecorder.VideoEncoder.H263); VIDEO_ENCODER_TABLE.put("h264", MediaRecorder.VideoEncoder.H264); - VIDEO_ENCODER_TABLE.put("h265", MediaRecorder.VideoEncoder.H265); +//TODO: Add dependency +// VIDEO_ENCODER_TABLE.put("h265", MediaRecorder.VideoEncoder.H265); VIDEO_ENCODER_TABLE.put("m4v", MediaRecorder.VideoEncoder.MPEG_4_SP); VIDEO_ENCODER_TABLE.putDefault(MediaRecorder.VideoEncoder.DEFAULT); @@ -900,8 +901,8 @@ public class VideoModule implements CameraModule, } private boolean is4KEnabled() { - if (mProfile.quality == CamcorderProfile.QUALITY_2160P || - mProfile.quality == CamcorderProfile.QUALITY_4kDCI) { + if (mProfile.quality == CamcorderProfile.QUALITY_2160P /*|| + mProfile.quality == CamcorderProfile.QUALITY_4kDCI*/) { return true; } else { return false; @@ -963,7 +964,8 @@ public class VideoModule implements CameraModule, boolean supported = false; List<VideoEncoderCap> videoEncoders = EncoderCapabilities.getVideoEncoders(); for (VideoEncoderCap videoEncoder: videoEncoders) { - if (videoEncoder.mCodec == mVideoEncoder) { +//TODO: How to handle HFRFrameWidth and HFRFrameHeight +/* if (videoEncoder.mCodec == mVideoEncoder) { int maxBitrate = (videoEncoder.mMaxHFRFrameWidth * videoEncoder.mMaxHFRFrameHeight * videoEncoder.mMaxHFRMode); @@ -972,6 +974,7 @@ public class VideoModule implements CameraModule, } break; } +*/ } return supported; @@ -2313,6 +2316,7 @@ public class VideoModule implements CameraModule, List<VideoEncoderCap> videoEncoders = EncoderCapabilities.getVideoEncoders(); for (VideoEncoderCap videoEncoder: videoEncoders) { if (videoEncoder.mCodec == mVideoEncoder){ +/* TODO: int maxBitrate = (videoEncoder.mMaxHFRFrameWidth * videoEncoder.mMaxHFRFrameHeight * videoEncoder.mMaxHFRMode); @@ -2331,6 +2335,7 @@ public class VideoModule implements CameraModule, } } break; +*/ } } if ("hfr".equals(HighFrameRate.substring(0,3))) { |