Merge "Improve thumbnail generation utilities." (e8b3d96b) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −2

Original line number	Diff line number	Diff line
		@@ -24988,8 +24988,9 @@ package android.media {
		field public static final int RATING_KEY_BY_USER = 268435457; // 0x10000001
		}

		public class MediaMetadataRetriever {
		public class MediaMetadataRetriever implements java.lang.AutoCloseable {
		ctor public MediaMetadataRetriever();
		method public void close();
		method public java.lang.String extractMetadata(int);
		method public byte[] getEmbeddedPicture();
		method public android.graphics.Bitmap getFrameAtIndex(int, android.media.MediaMetadataRetriever.BitmapParams);
		@@ -26076,7 +26077,12 @@ package android.media {

		public class ThumbnailUtils {
		ctor public ThumbnailUtils();
		method public static android.graphics.Bitmap createVideoThumbnail(java.lang.String, int);
		method public static deprecated android.graphics.Bitmap createAudioThumbnail(java.lang.String, int);
		method public static android.graphics.Bitmap createAudioThumbnail(java.io.File, android.util.Size, android.os.CancellationSignal) throws java.io.IOException;
		method public static deprecated android.graphics.Bitmap createImageThumbnail(java.lang.String, int);
		method public static android.graphics.Bitmap createImageThumbnail(java.io.File, android.util.Size, android.os.CancellationSignal) throws java.io.IOException;
		method public static deprecated android.graphics.Bitmap createVideoThumbnail(java.lang.String, int);
		method public static android.graphics.Bitmap createVideoThumbnail(java.io.File, android.util.Size, android.os.CancellationSignal) throws java.io.IOException;
		method public static android.graphics.Bitmap extractThumbnail(android.graphics.Bitmap, int, int);
		method public static android.graphics.Bitmap extractThumbnail(android.graphics.Bitmap, int, int, int);
		field public static final int OPTIONS_RECYCLE_INPUT = 2; // 0x2

core/java/android/provider/MediaStore.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1002,6 +1002,7 @@ public final class MediaStore {
		public static final int MICRO_KIND = 3;

		public static final Point MINI_SIZE = new Point(512, 384);
		public static final Point FULL_SCREEN_SIZE = new Point(1024, 786);
		public static final Point MICRO_SIZE = new Point(96, 96);
		}

		@@ -1127,6 +1128,8 @@ public final class MediaStore {
		final Point size;
		if (kind == ThumbnailConstants.MICRO_KIND) {
		size = ThumbnailConstants.MICRO_SIZE;
		} else if (kind == ThumbnailConstants.FULL_SCREEN_KIND) {
		size = ThumbnailConstants.FULL_SCREEN_SIZE;
		} else if (kind == ThumbnailConstants.MINI_KIND) {
		size = ThumbnailConstants.MINI_SIZE;
		} else {

media/java/android/media/MediaMetadataRetriever.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,7 @@ import java.util.Map;
		* MediaMetadataRetriever class provides a unified interface for retrieving
		* frame and meta data from an input media file.
		*/
		public class MediaMetadataRetriever
		{
		public class MediaMetadataRetriever implements AutoCloseable {
		static {
		System.loadLibrary("media_jni");
		native_init();
		@@ -672,6 +671,11 @@ public class MediaMetadataRetriever
		@UnsupportedAppUsage
		private native byte[] getEmbeddedPicture(int pictureType);

		@Override
		public void close() {
		release();
		}

		/**
		* Call it when one is done with the object. This method releases the memory
		* allocated internally.

media/java/android/media/ThumbnailUtils.java

+256 −310

File changed.

Preview size limit exceeded, changes collapsed.