summaryrefslogtreecommitdiff
path: root/media/jni/android_media_MediaPlayer.cpp
diff options
context:
space:
mode:
authorJaesung Chung <jaesung@google.com>2016-01-15 14:21:11 +0900
committerJaesung Chung <jaesung@google.com>2016-01-18 22:14:57 +0900
commitfe968dfc12fd4e0ef633ca88dfc403678bf4d16a (patch)
treeb3c2ea7adc86d7b4165c54fca441a3460dd0aa12 /media/jni/android_media_MediaPlayer.cpp
parentb42701047ab86a0539bdd3970f71858573fe10ec (diff)
ExifInterface: add support for reading metadata from RAW images
This CL depends on piex (github.com/google/piex), which is owned by Google Photos's RAW team. piex is capable of reading EXIF data that contains metadata, and finding the positions in an image of thumbnail and preview images from RAW images. piex supports DNG, CR2, NEF, NRW, ARW, RW2, ORF and RAF image file formats. ExifInterface gets thumbnail and metadata information from the above RAW image formats via piex. Bug: 26177215 Change-Id: I529f8032bcb2a9d3d9e857ff1365a26a4f040066
Diffstat (limited to 'media/jni/android_media_MediaPlayer.cpp')
-rw-r--r--media/jni/android_media_MediaPlayer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index be3672968398..e9d62dec80a4 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -1088,6 +1088,7 @@ static int register_android_media_MediaPlayer(JNIEnv *env)
return AndroidRuntime::registerNativeMethods(env,
"android/media/MediaPlayer", gMethods, NELEM(gMethods));
}
+extern int register_android_media_ExifInterface(JNIEnv *env);
extern int register_android_media_ImageReader(JNIEnv *env);
extern int register_android_media_ImageWriter(JNIEnv *env);
extern int register_android_media_Crypto(JNIEnv *env);
@@ -1219,6 +1220,11 @@ jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
goto bail;
}
+ if (register_android_media_ExifInterface(env) < 0) {
+ ALOGE("ERROR: ExifInterface native registration failed");
+ goto bail;
+ }
+
/* success -- return valid version number */
result = JNI_VERSION_1_4;