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

Merge "heif: fix Exif extraction in mtp database" into pi-dev

Browse Source
This commit is contained in:
Chong Zhang
2018-03-22 17:39:52 +00:00
committed by Android (Google) Code Review
parent de6dfd93e5 63f819203d
commit 9e64c01d02
1 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
media/jni/android_mtp_MtpDatabase.cpp
View File

@@ -39,6 +39,7 @@ extern "C" {
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/Log.h>
#include <jni.h>
#include <media/stagefright/NuMediaExtractor.h>
#include <nativehelper/JNIHelp.h>
#include <nativehelper/ScopedLocalRef.h>
@@ -788,6 +789,41 @@ static long getLongFromExifEntry(ExifEntry *e) {
return exif_get_long(e->data, o);
}
static ExifData *getExifFromExtractor(const char *path) {
std::unique_ptr<uint8_t[]> exifBuf;
ExifData *exifdata = NULL;
FILE *fp = fopen (path, "rb");
if (!fp) {
ALOGE("failed to open file");
return NULL;
}
sp<NuMediaExtractor> extractor = new NuMediaExtractor();
fseek(fp, 0L, SEEK_END);
if (extractor->setDataSource(fileno(fp), 0, ftell(fp)) != OK) {
ALOGE("failed to setDataSource");
fclose(fp);
return NULL;
}
off64_t offset;
size_t size;
if (extractor->getExifOffsetSize(&offset, &size) != OK) {
fclose(fp);
return NULL;
}
exifBuf.reset(new uint8_t[size]);
fseek(fp, offset, SEEK_SET);
if (fread(exifBuf.get(), 1, size, fp) == size) {
exifdata = exif_data_new_from_data(exifBuf.get(), size);
}
fclose(fp);
return exifdata;
}
MtpResponseCode MtpDatabase::getObjectInfo(MtpObjectHandle handle,
MtpObjectInfo& info) {
MtpString path;
@@ -834,7 +870,12 @@ MtpResponseCode MtpDatabase::getObjectInfo(MtpObjectHandle handle,
case MTP_FORMAT_EXIF_JPEG:
case MTP_FORMAT_HEIF:
case MTP_FORMAT_JFIF: {
ExifData *exifdata = exif_data_new_from_file(path);
ExifData *exifdata;
if (info.mFormat == MTP_FORMAT_HEIF) {
exifdata = getExifFromExtractor(path);
} else {
exifdata = exif_data_new_from_file(path);
}
if (exifdata) {
if ((false)) {
exif_data_foreach_content(exifdata, foreachcontent, NULL);
@@ -892,7 +933,12 @@ void* MtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize) {
case MTP_FORMAT_EXIF_JPEG:
case MTP_FORMAT_HEIF:
case MTP_FORMAT_JFIF: {
ExifData *exifdata = exif_data_new_from_file(path);
ExifData *exifdata;
if (format == MTP_FORMAT_HEIF) {
exifdata = getExifFromExtractor(path);
} else {
exifdata = exif_data_new_from_file(path);
}
if (exifdata) {
if (exifdata->data) {
result = malloc(exifdata->size);