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

am 2e4e9889: am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev

Browse Source 
* commit '2e4e98895b17ef248f5071202a3610ac715eaf0e':
  Use a native buffer for decoding images.
This commit is contained in:
Leon Scroggins III
2013-09-18 10:58:27 -07:00
committed by Android Git Automerger
parent 44ed752191 2e4e98895b
commit 44f65cb5fd
6 changed files with 66 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
graphics/java/android/graphics/BitmapFactory.java
View File

@@ -574,10 +574,7 @@ public class BitmapFactory {
final int asset = ((AssetManager.AssetInputStream) is).getAssetInt();
bm = nativeDecodeAsset(asset, outPadding, opts);
} else {
byte [] tempStorage = null;
if (opts != null) tempStorage = opts.inTempStorage;
if (tempStorage == null) tempStorage = new byte[DECODE_BUFFER_SIZE];
bm = nativeDecodeStream(is, tempStorage, outPadding, opts);
bm = decodeStreamInternal(is, outPadding, opts);
}
if (bm == null && opts != null && opts.inBitmap != null) {
@@ -592,6 +589,18 @@ public class BitmapFactory {
return bm;
}
/**
* Private helper function for decoding an InputStream natively. Buffers the input enough to
* do a rewind as needed, and supplies temporary storage if necessary. is MUST NOT be null.
*/
private static Bitmap decodeStreamInternal(InputStream is, Rect outPadding, Options opts) {
// ASSERT(is != null);
byte [] tempStorage = null;
if (opts != null) tempStorage = opts.inTempStorage;
if (tempStorage == null) tempStorage = new byte[DECODE_BUFFER_SIZE];
return nativeDecodeStream(is, tempStorage, outPadding, opts);
}
/**
* Decode an input stream into a bitmap. If the input stream is null, or
* cannot be used to decode a bitmap, the function returns null.
@@ -629,13 +638,8 @@ public class BitmapFactory {
bm = nativeDecodeFileDescriptor(fd, outPadding, opts);
} else {
FileInputStream fis = new FileInputStream(fd);
// FIXME: If nativeDecodeStream grabbed the pointer to tempStorage
// from Options, this code would not need to be duplicated.
byte [] tempStorage = null;
if (opts != null) tempStorage = opts.inTempStorage;
if (tempStorage == null) tempStorage = new byte[DECODE_BUFFER_SIZE];
try {
bm = nativeDecodeStream(fis, tempStorage, outPadding, opts);
bm = decodeStreamInternal(fis, outPadding, opts);
} finally {
try {
fis.close();