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

Commit 5e1f3e41 authored by Danny Fernandes's avatar Danny Fernandes Committed by Android (Google) Code Review
Browse files

Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles... 

Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb
parents aa9c0273 7b3f2632

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

+5 −0
Original line number Diff line number Diff line
@@ -197,6 +197,11 @@ public class MediaProperties { 
    public static final int FILE_M4V = 10;

    public static final int FILE_UNSUPPORTED = 255;



    /**

     * Undefined video codec profiles

     */

    public static final int UNDEFINED_VIDEO_PROFILE = 255;



    /**

     * The array of the supported file formats

     */

media/java/android/media/videoeditor/MediaVideoItem.java

+5 −0
Original line number Diff line number Diff line
@@ -139,6 +139,11 @@ public class MediaVideoItem extends MediaItem { 
                throw new IllegalArgumentException("Unsupported Video Codec Format in Input File");

        }



        /* Check if the profile is unsupported. */

        if (properties.profileAndLevel == MediaProperties.UNDEFINED_VIDEO_PROFILE) {

            throw new IllegalArgumentException("Unsupported Video Codec Profile in Input File");

        }



        mWidth = properties.width;

        mHeight = properties.height;

        mAspectRatio = mMANativeHelper.getAspectRatio(properties.width,