diff options
author | Susmitha Gummalla <vgummall@codeaurora.org> | 2016-01-07 20:57:13 +0100 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-07 13:25:27 -0800 |
commit | 6bf48d33cacbdcc1df5de29c5a07b1cf5bd1a974 (patch) | |
tree | c7e341d4882290ba7c90bb75a570f65516d41664 /src | |
parent | 9ef1c8ae8458a7ae9e6f80b65ecd958408927c5b (diff) | |
download | android_packages_apps_Snap-6bf48d33cacbdcc1df5de29c5a07b1cf5bd1a974.tar.gz android_packages_apps_Snap-6bf48d33cacbdcc1df5de29c5a07b1cf5bd1a974.tar.bz2 android_packages_apps_Snap-6bf48d33cacbdcc1df5de29c5a07b1cf5bd1a974.zip |
Revert "SnapdragonCamera: Filter out unsupported video encoders in
app"
This reverts commit bac24e32cc1d2ff2fd5150e304b0898f449628ef.
This is removing H265 encoder from the UI options, which is a FR
requirement on 8994. We need to add H265 in media profiles and
then commit this change.
Change-Id: Id67fe2c83b12011ae82a14183ecc1ef34a38e8fb
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 92c8b5038..f6e4892cd 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -29,10 +29,6 @@ import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; import android.hardware.Camera.Size; import android.media.CamcorderProfile; -import android.media.MediaRecorder; -import android.media.EncoderCapabilities; -import android.media.EncoderCapabilities.VideoEncoderCap; -import java.util.HashMap; import android.util.Log; import com.android.camera.util.ApiHelper; @@ -255,16 +251,6 @@ public class CameraSettings { public static String mKeyIso = null; public static String mKeyIsoValues = null; - private static final HashMap<Integer, String> - VIDEO_ENCODER_TABLE = new HashMap<Integer, String>(); - - static { - VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H263, "h263"); - VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H264, "h264"); - VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H265, "h265"); - VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.MPEG_4_SP, "m4v"); - } - public CameraSettings(Activity activity, Parameters parameters, int cameraId, CameraInfo[] cameraInfo) { mContext = activity; @@ -573,20 +559,6 @@ public class CameraSettings { return split(str); } - private static List<String> getSupportedVideoEncoders() { - ArrayList<String> supported = new ArrayList<String>(); - String str = null; - List<VideoEncoderCap> videoEncoders = EncoderCapabilities.getVideoEncoders(); - for (VideoEncoderCap videoEncoder: videoEncoders) { - str = VIDEO_ENCODER_TABLE.get(videoEncoder.mCodec); - if (str != null) { - supported.add(str); - } - } - return supported; - - } - private static ListPreference removeLeadingISO(ListPreference pref) { CharSequence entryValues[] = pref.getEntryValues(); if (entryValues.length > 0) { @@ -833,7 +805,6 @@ public class CameraSettings { ListPreference videoHfrMode = group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE); ListPreference seeMoreMode = group.findPreference(KEY_SEE_MORE); - ListPreference videoEncoder = group.findPreference(KEY_VIDEO_ENCODER); // Since the screen could be loaded from different resources, we need // to check if the preference is available here @@ -852,10 +823,6 @@ public class CameraSettings { mCameraId,mParameters)); } - if (videoEncoder != null) { - filterUnsupportedOptions(group, videoEncoder, getSupportedVideoEncoders()); - } - if (pictureSize != null) { filterUnsupportedOptions(group, pictureSize, sizeListToStringList( mParameters.getSupportedPictureSizes())); |