diff options
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 6 | ||||
| -rw-r--r-- | media/java/android/media/SubtitleTrack.java | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index e25714a53e28..66175d04680d 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1826,11 +1826,7 @@ public class MediaPlayer implements SubtitleController.Listener } SubtitleTrack track = mInbandSubtitleTracks[index]; if (track != null) { - long runID = data.getStartTimeUs() + 1; - track.onData(data.getData(), true /* eos */, runID); - track.setRunDiscardTimeMs( - runID, - (data.getStartTimeUs() + data.getDurationUs()) / 1000); + track.onData(data); } } }; diff --git a/media/java/android/media/SubtitleTrack.java b/media/java/android/media/SubtitleTrack.java index b0e182dfac74..9fedf63f2190 100644 --- a/media/java/android/media/SubtitleTrack.java +++ b/media/java/android/media/SubtitleTrack.java @@ -75,6 +75,14 @@ public abstract class SubtitleTrack implements MediaTimeProvider.OnMediaTimeList private long mNextScheduledTimeMs = -1; + protected void onData(SubtitleData data) { + long runID = data.getStartTimeUs() + 1; + onData(data.getData(), true /* eos */, runID); + setRunDiscardTimeMs( + runID, + (data.getStartTimeUs() + data.getDurationUs()) / 1000); + } + /** * Called when there is input data for the subtitle track. The * complete subtitle for a track can include multiple whole units |