diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/ExifInterface.java | 16 | ||||
| -rw-r--r-- | media/java/android/media/Image.java | 10 | ||||
| -rw-r--r-- | media/java/android/media/RemoteControlClient.java | 1 | ||||
| -rw-r--r-- | media/java/android/media/RemoteDisplay.java | 17 | ||||
| -rw-r--r-- | media/jni/android_media_ImageReader.cpp | 1 |
5 files changed, 36 insertions, 9 deletions
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index 4cd3e37..20eb356 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -291,6 +291,20 @@ public class ExifInterface { } /** + * Returns the offset and length of thumbnail inside the JPEG file, or + * {@code null} if there is no thumbnail. + * + * @return two-element array, the offset in the first value, and length in + * the second, or {@code null} if no thumbnail was found. + * @hide + */ + public long[] getThumbnailRange() { + synchronized (sLock) { + return getThumbnailRangeNative(mFilename); + } + } + + /** * Stores the latitude and longitude value in a float array. The first element is * the latitude, and the second element is the longitude. Returns false if the * Exif tags are not available. @@ -416,4 +430,6 @@ public class ExifInterface { private native void commitChangesNative(String fileName); private native byte[] getThumbnailNative(String fileName); + + private native long[] getThumbnailRangeNative(String fileName); } diff --git a/media/java/android/media/Image.java b/media/java/android/media/Image.java index d06eeb31..9f442f5 100644 --- a/media/java/android/media/Image.java +++ b/media/java/android/media/Image.java @@ -55,11 +55,11 @@ public interface Image extends AutoCloseable { * the planes is as follows: * * <table> - * <th> - * <td>Format</td> - * <td>Plane count</td> - * <td>Layout details</td> - * </th> + * <tr> + * <th>Format</th> + * <th>Plane count</th> + * <th>Layout details</th> + * </tr> * <tr> * <td>{@link android.graphics.ImageFormat#JPEG}</td> * <td>1</td> diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index 2c211cc..4dcac31 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -402,6 +402,7 @@ public class RemoteControlClient MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER, MediaMetadataRetriever.METADATA_KEY_DISC_NUMBER, MediaMetadataRetriever.METADATA_KEY_DURATION, + MediaMetadataRetriever.METADATA_KEY_YEAR, MetadataEditor.LONG_KEY_RATING_TYPE, MetadataEditor.LONG_KEY_RATING_BY_OTHERS, MetadataEditor.LONG_KEY_RATING_BY_USER}; diff --git a/media/java/android/media/RemoteDisplay.java b/media/java/android/media/RemoteDisplay.java index b463d26..7afce1a 100644 --- a/media/java/android/media/RemoteDisplay.java +++ b/media/java/android/media/RemoteDisplay.java @@ -42,6 +42,8 @@ public final class RemoteDisplay { private native int nativeListen(String iface); private native void nativeDispose(int ptr); + private native void nativePause(int ptr); + private native void nativeResume(int ptr); private RemoteDisplay(Listener listener, Handler handler) { mListener = listener; @@ -87,6 +89,14 @@ public final class RemoteDisplay { dispose(false); } + public void pause() { + nativePause(mPtr); + } + + public void resume() { + nativeResume(mPtr); + } + private void dispose(boolean finalized) { if (mPtr != 0) { if (mGuard != null) { @@ -113,11 +123,11 @@ public final class RemoteDisplay { // Called from native. private void notifyDisplayConnected(final Surface surface, - final int width, final int height, final int flags) { + final int width, final int height, final int flags, final int session) { mHandler.post(new Runnable() { @Override public void run() { - mListener.onDisplayConnected(surface, width, height, flags); + mListener.onDisplayConnected(surface, width, height, flags, session); } }); } @@ -146,7 +156,8 @@ public final class RemoteDisplay { * Listener invoked when the remote display connection changes state. */ public interface Listener { - void onDisplayConnected(Surface surface, int width, int height, int flags); + void onDisplayConnected(Surface surface, + int width, int height, int flags, int session); void onDisplayDisconnected(); void onDisplayError(int error); } diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index 7d914d2..7f1d946 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -35,7 +35,6 @@ #define ALIGN(x, mask) ( ((x) + (mask) - 1) & ~((mask) - 1) ) -#define ANDROID_MEDIA_IMAGEREADER_JNI_ID "mCpuConsumer" #define ANDROID_MEDIA_IMAGEREADER_CTX_JNI_ID "mNativeContext" #define ANDROID_MEDIA_SURFACEIMAGE_BUFFER_JNI_ID "mLockedBuffer" #define ANDROID_MEDIA_SURFACEIMAGE_TS_JNI_ID "mTimestamp" |