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

Merge "Make MediaParser.SeekMap a final class"

Browse Source
This commit is contained in:
Santiago Seifert
2019-12-11 10:35:26 +00:00
committed by Android (Google) Code Review
parent 44cf6950cf 14167948ed
commit dda7e6a9c7
2 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -25646,7 +25646,7 @@ package android.media {
method public void onTracksFound(int);
}
public static interface MediaParser.SeekMap {
public static final class MediaParser.SeekMap {
method public long getDurationUs();
method @NonNull public android.util.Pair<android.media.MediaParser.SeekPoint,android.media.MediaParser.SeekPoint> getSeekPoints(long);
method public boolean isSeekable();

51
media/apex/java/android/media/MediaParser.java
View File

@@ -156,19 +156,29 @@ public final class MediaParser {
* <p>A {@link SeekPoint} is a position in the stream from which a player may successfully start
* playing media samples.
*/
public interface SeekMap {
public static final class SeekMap {
/** Returned by {@link #getDurationUs()} when the duration is unknown. */
int UNKNOWN_DURATION = Integer.MIN_VALUE;
public static final int UNKNOWN_DURATION = Integer.MIN_VALUE;
private final com.google.android.exoplayer2.extractor.SeekMap mExoPlayerSeekMap;
private SeekMap(com.google.android.exoplayer2.extractor.SeekMap exoplayerSeekMap) {
mExoPlayerSeekMap = exoplayerSeekMap;
}
/** Returns whether seeking is supported. */
boolean isSeekable();
public boolean isSeekable() {
return mExoPlayerSeekMap.isSeekable();
}
/**
* Returns the duration of the stream in microseconds or {@link #UNKNOWN_DURATION} if the
* duration is unknown.
*/
long getDurationUs();
public long getDurationUs() {
return mExoPlayerSeekMap.getDurationUs();
}
/**
* Obtains {@link SeekPoint SeekPoints} for the specified seek time in microseconds.
@@ -184,7 +194,10 @@ public final class MediaParser {
* @return The corresponding {@link SeekPoint SeekPoints}.
*/
@NonNull
Pair<SeekPoint, SeekPoint> getSeekPoints(long timeUs);
public Pair<SeekPoint, SeekPoint> getSeekPoints(long timeUs) {
SeekPoints seekPoints = mExoPlayerSeekMap.getSeekPoints(timeUs);
return new Pair<>(toSeekPoint(seekPoints.first), toSeekPoint(seekPoints.second));
}
}
/** Defines a seek point in a media stream. */
@@ -647,7 +660,7 @@ public final class MediaParser {
@Override
public void seekMap(com.google.android.exoplayer2.extractor.SeekMap exoplayerSeekMap) {
mOutputConsumer.onSeekMap(new ExoToMediaParserSeekMapAdapter(exoplayerSeekMap));
mOutputConsumer.onSeekMap(new SeekMap(exoplayerSeekMap));
}
}
@@ -764,32 +777,6 @@ public final class MediaParser {
Extractor createInstance();
}
private static class ExoToMediaParserSeekMapAdapter implements SeekMap {
private final com.google.android.exoplayer2.extractor.SeekMap mExoPlayerSeekMap;
private ExoToMediaParserSeekMapAdapter(
com.google.android.exoplayer2.extractor.SeekMap exoplayerSeekMap) {
mExoPlayerSeekMap = exoplayerSeekMap;
}
@Override
public boolean isSeekable() {
return mExoPlayerSeekMap.isSeekable();
}
@Override
public long getDurationUs() {
return mExoPlayerSeekMap.getDurationUs();
}
@Override
public Pair<SeekPoint, SeekPoint> getSeekPoints(long timeUs) {
SeekPoints seekPoints = mExoPlayerSeekMap.getSeekPoints(timeUs);
return new Pair<>(toSeekPoint(seekPoints.first), toSeekPoint(seekPoints.second));
}
}
// Private static methods.
private static MediaFormat toMediaFormat(Format format) {