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

Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1

Browse Source
This commit is contained in:
Chih-Chung Chang
2011-11-07 22:59:55 -08:00
committed by Android (Google) Code Review
parent ee7ebb3257 b1224ff1c4
commit 713c9a331e
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media/java/android/media/videoeditor/MediaImageItem.java
View File

@@ -154,7 +154,7 @@ public class MediaImageItem extends MediaItem {
final Bitmap imageBitmap;
if (mHeight > maxResolution.second) {
if (mWidth > maxResolution.first || mHeight > maxResolution.second) {
/**
* We need to scale the image
*/
@@ -971,14 +971,13 @@ public class MediaImageItem extends MediaItem {
/**
* Create the bitmap from file
*/
if (nativeWidth / bitmapWidth > 1) {
final BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = nativeWidth / (int)bitmapWidth;
srcBitmap = BitmapFactory.decodeFile(filename, options);
} else {
srcBitmap = BitmapFactory.decodeFile(filename);
}
int sampleSize = (int) Math.ceil(Math.max(
(float) nativeWidth / bitmapWidth,
(float) nativeHeight / bitmapHeight));
sampleSize = nextPowerOf2(sampleSize);
final BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = sampleSize;
srcBitmap = BitmapFactory.decodeFile(filename, options);
} else {
bitmapWidth = width;
bitmapHeight = height;
@@ -1009,4 +1008,14 @@ public class MediaImageItem extends MediaItem {
srcBitmap.recycle();
return bitmap;
}
public static int nextPowerOf2(int n) {
n -= 1;
n |= n >>> 16;
n |= n >>> 8;
n |= n >>> 4;
n |= n >>> 2;
n |= n >>> 1;
return n + 1;
}
}