diff options
| author | Shuzhen Wang <shuzhenw@codeaurora.org> | 2016-01-02 20:14:18 +0100 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-02 20:47:57 +0100 |
| commit | a575c653126a54850ed220b8255f035df4cdfe05 (patch) | |
| tree | 09519219c8c8e4c3ce987d639e09bcae4ac53f88 /src/com/android/camera/VideoModule.java | |
| parent | 0575f19cf85fc06a070dd1ec15d952126e76d96c (diff) | |
| download | android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.gz android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.bz2 android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.zip | |
SnapdragonCamera: Fix compilation
1. Address compilation due to compiler upgrade.
2. Comment out video dependencies to enable camera.
3. Fix compilation issue due to IMountService interface change.
4. Comment out ExtendedFace.
5. Remove non-standard video resolutions.
Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
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))) { |