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

Commit 90c91c2a authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "support for CEA-608 closed caption"

parents 86cdd73d bdfd9102

core/java/android/widget/VideoView.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.DialogInterface; 
import android.content.res.Resources;

import android.graphics.Canvas;

import android.media.AudioManager;

import android.media.ClosedCaptionRenderer;

import android.media.MediaFormat;

import android.media.MediaPlayer;

import android.media.MediaPlayer.OnCompletionListener;
@@ -316,6 +317,7 @@ public class VideoView extends SurfaceView 
                    context, mMediaPlayer.getMediaTimeProvider(), mMediaPlayer);

            controller.registerRenderer(new WebVttRenderer(context));

            controller.registerRenderer(new TtmlRenderer(context));

            controller.registerRenderer(new ClosedCaptionRenderer(context));

            mMediaPlayer.setSubtitleAnchor(controller, this);



            if (mAudioSession != 0) {

media/java/android/media/ClosedCaptionRenderer.java

0 → 100644
+1282 −0

File added.

Preview size limit exceeded, changes collapsed.

media/java/android/media/MediaPlayer.java

+6 −0
Original line number Diff line number Diff line
@@ -1785,6 +1785,12 @@ public class MediaPlayer implements SubtitleController.Listener 
     */

    public static final String MEDIA_MIMETYPE_TEXT_VTT = "text/vtt";



    /**

     * MIME type for CEA-608 closed caption data.

     * @hide

     */

    public static final String MEDIA_MIMETYPE_TEXT_CEA_608 = "text/cea-608";



    /*

     * A helper function to check if the mime type is supported by media framework.

     */