diff options
| author | Andreas Huber <andih@google.com> | 2012-05-09 11:25:29 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-05-09 11:32:51 -0700 |
| commit | f86374adec8bd77af7b012f788ea59575296facb (patch) | |
| tree | 642e4285603deea4f123dfff6544b2792b819559 | |
| parent | 2f4b10e2d4320db490b03eb198ce034302ef00fc (diff) | |
Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
sense for the java API.
Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774
related-to-bug: 6276111
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaExtractor.java | 5 | ||||
| -rw-r--r-- | media/jni/android_media_MediaExtractor.cpp | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index 770b5e07b6a9..ce3164f49b4b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11236,7 +11236,6 @@ package android.media { method public void unselectTrack(int); field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2 field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1 - field public static final int SEEK_TO_CLOSEST = 3; // 0x3 field public static final int SEEK_TO_CLOSEST_SYNC = 2; // 0x2 field public static final int SEEK_TO_NEXT_SYNC = 1; // 0x1 field public static final int SEEK_TO_PREVIOUS_SYNC = 0; // 0x0 diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 58b30dbe5d0d..d3a00c23d3c4 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -225,11 +225,6 @@ final public class MediaExtractor { * If possible, seek to the sync sample closest to the specified time */ public static final int SEEK_TO_CLOSEST_SYNC = 2; - /** - * If possible, seek to a sample closest to the specified time, which may - * NOT be a sync sample! - */ - public static final int SEEK_TO_CLOSEST = 3; /** * All selected tracks seek near the requested time according to the diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index c93baf1e4726..351ff0445ba3 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -313,7 +313,7 @@ static void android_media_MediaExtractor_seekTo( } if (mode < MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC - || mode > MediaSource::ReadOptions::SEEK_CLOSEST) { + || mode >= MediaSource::ReadOptions::SEEK_CLOSEST) { jniThrowException(env, "java/lang/IllegalArgumentException", NULL); return; } |