diff options
| author | Santosh Madhava <smadhava@google.com> | 2011-02-27 17:02:12 -0800 |
|---|---|---|
| committer | Santosh Madhava <smadhava@google.com> | 2011-02-27 17:37:23 -0800 |
| commit | bcbf68583e38eeb79266f9f3a8c3d1b17f75a8c2 (patch) | |
| tree | aeda7c2a328a8de96c62b4b0ec8cb79206bddc35 /media | |
| parent | fd8876140df4aafe47240a75b0d75a1cb057194e (diff) | |
| download | frameworks_base-bcbf68583e38eeb79266f9f3a8c3d1b17f75a8c2.zip frameworks_base-bcbf68583e38eeb79266f9f3a8c3d1b17f75a8c2.tar.gz frameworks_base-bcbf68583e38eeb79266f9f3a8c3d1b17f75a8c2.tar.bz2 | |
Fix for issue 3466385: Low quality video properties are applied to all
Change-Id: Idcae85d88de65bae549263f9c43a6f3020dd63a1
Diffstat (limited to 'media')
3 files changed, 8 insertions, 2 deletions
diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java index e0df257..53bbb0f 100644 --- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java +++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java @@ -3556,7 +3556,7 @@ class MediaArtistNativeHelper { case MediaProperties.ASPECT_RATIO_4_3: if (height == MediaProperties.HEIGHT_480) retValue = VideoFrameSize.VGA; - if (height == MediaProperties.HEIGHT_720) + else if (height == MediaProperties.HEIGHT_720) retValue = VideoFrameSize.S720p; break; case MediaProperties.ASPECT_RATIO_5_3: @@ -3566,6 +3566,8 @@ class MediaArtistNativeHelper { case MediaProperties.ASPECT_RATIO_11_9: if (height == MediaProperties.HEIGHT_144) retValue = VideoFrameSize.QCIF; + else if (height == MediaProperties.HEIGHT_288) + retValue = VideoFrameSize.CIF; break; } if (retValue == VideoFrameSize.SIZE_UNDEFINED) { diff --git a/media/java/android/media/videoeditor/MediaProperties.java b/media/java/android/media/videoeditor/MediaProperties.java index 0b7ec08..0225807 100755 --- a/media/java/android/media/videoeditor/MediaProperties.java +++ b/media/java/android/media/videoeditor/MediaProperties.java @@ -29,6 +29,7 @@ public class MediaProperties { * Supported heights */ public static final int HEIGHT_144 = 144; + public static final int HEIGHT_288 = 288; public static final int HEIGHT_360 = 360; public static final int HEIGHT_480 = 480; public static final int HEIGHT_720 = 720; @@ -82,7 +83,8 @@ public class MediaProperties { @SuppressWarnings({"unchecked"}) private static final Pair<Integer, Integer>[] ASPECT_RATIO_11_9_RESOLUTIONS = new Pair[] { - new Pair<Integer, Integer>(176, HEIGHT_144) + new Pair<Integer, Integer>(176, HEIGHT_144), + new Pair<Integer, Integer>(352, HEIGHT_288) }; @SuppressWarnings({"unchecked"}) diff --git a/media/java/android/media/videoeditor/VideoEditorImpl.java b/media/java/android/media/videoeditor/VideoEditorImpl.java index a6b4544..e03a7b3 100755 --- a/media/java/android/media/videoeditor/VideoEditorImpl.java +++ b/media/java/android/media/videoeditor/VideoEditorImpl.java @@ -373,6 +373,8 @@ public class VideoEditorImpl implements VideoEditor { switch (height) { case MediaProperties.HEIGHT_144: break; + case MediaProperties.HEIGHT_288: + break; case MediaProperties.HEIGHT_360: break; case MediaProperties.HEIGHT_480: |