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

Merge "ExifInterface: return only a JPEG-compressed thumbnail of RAW images" into nyc-dev

Browse Source
This commit is contained in:
Jaesung Chung
2016-04-15 00:19:07 +00:00
committed by Android (Google) Code Review
parent f332328743 742e89f67d
commit 02f9e23525
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/jni/android_media_ExifInterface.cpp
View File

@@ -136,7 +136,8 @@ static jobject getRawAttributes(JNIEnv* env, SkStream* stream, bool returnThumbn
KeyedVector<String8, String8> map;
if (image_data.thumbnail.length > 0) {
if (image_data.thumbnail.length > 0
&& image_data.thumbnail.format == ::piex::Image::kJpegCompressed) {
map.add(String8("hasThumbnail"), String8("true"));
map.add(String8("thumbnailOffset"), String8::format("%d", image_data.thumbnail.offset));
map.add(String8("thumbnailLength"), String8::format("%d", image_data.thumbnail.length));

5
media/jni/android_mtp_MtpDatabase.cpp
View File

@@ -932,8 +932,9 @@ void* MyMtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize)
break;
}
if (image_data.thumbnail.length == 0) {
// No thumbnail.
if (image_data.thumbnail.length == 0
|| image_data.thumbnail.format == ::piex::Image::kJpegCompressed) {
// No thumbnail or non jpeg thumbnail.
break;
}