diff options
| author | Andreas Huber <andih@google.com> | 2012-05-09 13:27:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-09 13:27:03 -0700 |
| commit | 610ac933fca53322c78f3bdf985bbc99703f1bb5 (patch) | |
| tree | 4a1fabeabd3b5ef59929f4ead6c2d7ad70836582 /media | |
| parent | a61efe07ca2c865a3f602a3ebdf8f341ff09e2c8 (diff) | |
| parent | 039495d3dc19b96e3953fde81b74c44d0ac5c2f0 (diff) | |
| download | frameworks_base-610ac933fca53322c78f3bdf985bbc99703f1bb5.zip frameworks_base-610ac933fca53322c78f3bdf985bbc99703f1bb5.tar.gz frameworks_base-610ac933fca53322c78f3bdf985bbc99703f1bb5.tar.bz2 | |
am 039495d3: am ea86b36f: Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev
* commit '039495d3dc19b96e3953fde81b74c44d0ac5c2f0':
Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaExtractor.java | 5 | ||||
| -rw-r--r-- | media/jni/android_media_MediaExtractor.cpp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 58b30db..d3a00c2 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 c93baf1..351ff04 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; } |