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

Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev

Browse Source
This commit is contained in:
Andreas Huber
2012-05-09 13:20:32 -07:00
committed by Android (Google) Code Review
parent 01028b6fa4 f86374adec
commit ea86b36f80
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -11236,7 +11236,6 @@ package android.media {
method public void unselectTrack(int); method public void unselectTrack(int);
field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2 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 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_CLOSEST_SYNC = 2; // 0x2
field public static final int SEEK_TO_NEXT_SYNC = 1; // 0x1 field public static final int SEEK_TO_NEXT_SYNC = 1; // 0x1
field public static final int SEEK_TO_PREVIOUS_SYNC = 0; // 0x0 field public static final int SEEK_TO_PREVIOUS_SYNC = 0; // 0x0

5
media/java/android/media/MediaExtractor.java
View File

@@ -225,11 +225,6 @@ final public class MediaExtractor {
* If possible, seek to the sync sample closest to the specified time * If possible, seek to the sync sample closest to the specified time
*/ */
public static final int SEEK_TO_CLOSEST_SYNC = 2; 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 * All selected tracks seek near the requested time according to the

2
media/jni/android_media_MediaExtractor.cpp
View File

@@ -313,7 +313,7 @@ static void android_media_MediaExtractor_seekTo(
} }
if (mode < MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC if (mode < MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC
|| mode > MediaSource::ReadOptions::SEEK_CLOSEST) { || mode >= MediaSource::ReadOptions::SEEK_CLOSEST) {
jniThrowException(env, "java/lang/IllegalArgumentException", NULL); jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
return; return;
} }