Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb

Browse Source 
* commit '5e1f3e4112f77bdb99bfef8c3ba185f0cb89e5ef':
  Fixed 3419090 Throwing exception for unsupported video codec profiles and level
This commit is contained in:
Danny Fernandes
2011-02-04 13:39:50 -08:00
committed by Android Git Automerger
parent 03a9de0552 5e1f3e4112
commit 1734e8350f
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/videoeditor/MediaProperties.java
View File

@@ -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
*/

5
media/java/android/media/videoeditor/MediaVideoItem.java
View File

@@ -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,