Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d4769c1 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "Move SubtitleData processing to SubtitleTrack"

parents 5c80ad20 38c209b9

media/java/android/media/MediaPlayer.java

+1 −5
Original line number Diff line number Diff line
@@ -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);

            }

        }

    };

media/java/android/media/SubtitleTrack.java

+8 −0
Original line number Diff line number Diff line
@@ -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