Merge "Merging the same files on top of tree." into honeycomb (ff843254) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -339,10 +339,13 @@ class MediaArtistNativeHelper {
		public static final int JPG = 5;

		/** GIF image file type. */
		public static final int GIF = 6;
		public static final int GIF = 7;

		/** PNG image file type. */
		public static final int PNG = 7;
		public static final int PNG = 8;

		/** M4V file type. */
		public static final int M4V = 10;

		/** Unsupported file type. */
		public static final int UNSUPPORTED = 255;
		@@ -3256,6 +3259,9 @@ class MediaArtistNativeHelper {
		case FileType.MP3:
		retValue = MediaProperties.FILE_MP3;
		break;
		case FileType.M4V:
		retValue = MediaProperties.FILE_M4V;
		break;

		default:
		retValue = -1;
		@@ -3386,6 +3392,9 @@ class MediaArtistNativeHelper {
		case MediaProperties.FILE_PNG:
		retValue = FileType.PNG;
		break;
		case MediaProperties.FILE_M4V:
		retValue = FileType.M4V;
		break;

		default:
		retValue = -1;

+8 −3

Original line number	Diff line number	Diff line
		@@ -190,15 +190,20 @@ public class MediaProperties {
		public static final int FILE_MP3 = 3;
		// 4 is for PCM
		public static final int FILE_JPEG = 5;
		// 6 is for GIF
		public static final int FILE_PNG = 7;
		// 6 is for BMP
		// 7 is for GIF
		public static final int FILE_PNG = 8;
		// 9 is for ARGB8888
		public static final int FILE_M4V = 10;
		public static final int FILE_UNSUPPORTED = 255;

		/**
		* The array of the supported file formats
		*/
		private static final int[] SUPPORTED_VIDEO_FILE_FORMATS = new int[] {
		FILE_3GP,
		FILE_MP4
		FILE_MP4,
		FILE_M4V
		};

		/**

+1 −4

Original line number	Diff line number	Diff line
		@@ -120,8 +120,8 @@ public class MediaVideoItem extends MediaItem {

		switch (mMANativeHelper.getFileType(properties.fileType)) {
		case MediaProperties.FILE_3GP:
		break;
		case MediaProperties.FILE_MP4:
		case MediaProperties.FILE_M4V:
		break;

		default:
		@@ -130,11 +130,8 @@ public class MediaVideoItem extends MediaItem {

		switch (mMANativeHelper.getVideoCodecType(properties.videoFormat)) {
		case MediaProperties.VCODEC_H263:
		break;
		case MediaProperties.VCODEC_H264BP:
		break;
		case MediaProperties.VCODEC_H264MP:
		break;
		case MediaProperties.VCODEC_MPEG4:
		break;

+2 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,7 @@ VIDEOEDIT_JAVA_DEFINE_CONSTANTS(ClipType)
		VIDEOEDIT_JAVA_CONSTANT_INIT("MP3", M4VIDEOEDITING_kFileType_MP3),
		VIDEOEDIT_JAVA_CONSTANT_INIT("PCM", M4VIDEOEDITING_kFileType_PCM),
		VIDEOEDIT_JAVA_CONSTANT_INIT("JPG", M4VIDEOEDITING_kFileType_JPG),
		VIDEOEDIT_JAVA_CONSTANT_INIT("M4V", M4VIDEOEDITING_kFileType_M4V),
		VIDEOEDIT_JAVA_CONSTANT_INIT("UNSUPPORTED", M4VIDEOEDITING_kFileType_Unsupported)
		};

		@@ -330,6 +331,7 @@ VIDEOEDIT_JAVA_DEFINE_CONSTANTS(FileType)
		VIDEOEDIT_JAVA_CONSTANT_INIT("JPG", VideoEditClasses_kFileType_JPG),
		VIDEOEDIT_JAVA_CONSTANT_INIT("GIF", VideoEditClasses_kFileType_GIF),
		VIDEOEDIT_JAVA_CONSTANT_INIT("PNG", VideoEditClasses_kFileType_PNG),
		VIDEOEDIT_JAVA_CONSTANT_INIT("M4V", VideoEditClasses_kFileType_M4V),
		VIDEOEDIT_JAVA_CONSTANT_INIT("UNSUPPORTED", VideoEditClasses_kFileType_Unsupported)
		};

+3 −0

Original line number	Diff line number	Diff line
		@@ -91,8 +91,11 @@ typedef enum
		VideoEditClasses_kFileType_MP3,
		VideoEditClasses_kFileType_PCM,
		VideoEditClasses_kFileType_JPG,
		VideoEditClasses_kFileType_BMP,
		VideoEditClasses_kFileType_GIF,
		VideoEditClasses_kFileType_PNG,
		VideoEditClasses_kFileType_ARGB8888,
		VideoEditClasses_kFileType_M4V,
		VideoEditClasses_kFileType_Unsupported
		} VideoEditClasses_FileType;