Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcbf6858 authored by Santosh Madhava's avatar Santosh Madhava
Browse files

Fix for issue 3466385: Low quality video properties are applied to all 

Change-Id: Idcae85d88de65bae549263f9c43a6f3020dd63a1
parent fd887614

media/java/android/media/videoeditor/MediaArtistNativeHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {

media/java/android/media/videoeditor/MediaProperties.java

+3 −1
Original line number Diff line number Diff line
@@ -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"})

media/java/android/media/videoeditor/VideoEditorImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -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: