-Added subtitles loading and display.

-Added subtitles switching button to popup and main players.
-Added aspect ratio switching button to popup pand main players.

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

@@ -49,6 +49,7 @@ import android.widget.RemoteViews;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 
@@ -642,7 +643,7 @@ public final class PopupVideoPlayer extends Service {
         //////////////////////////////////////////////////////////////////////////*/
 
         /*package-private*/ void enableVideoRenderer(final boolean enable) {
-            final int videoRendererIndex = getVideoRendererIndex();
+            final int videoRendererIndex = getRendererIndex(C.TRACK_TYPE_VIDEO);
             if (trackSelector != null && videoRendererIndex != -1) {
                 trackSelector.setRendererDisabled(videoRendererIndex, !enable);
             }

app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java

@@ -29,12 +29,14 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SurfaceView;
@@ -46,17 +48,24 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MergingMediaSource;
+import com.google.android.exoplayer2.source.SingleSampleMediaSource;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+import com.google.android.exoplayer2.ui.SubtitleView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.Subtitles;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.playlist.PlayQueueItem;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ListHelper;
@@ -64,6 +73,9 @@ import org.schabi.newpipe.util.ListHelper;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.android.exoplayer2.C.SELECTION_FLAG_AUTOSELECT;
+import static com.google.android.exoplayer2.C.TIME_UNSET;
+import static com.google.android.exoplayer2.C.TRACK_TYPE_TEXT;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
 import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
@@ -95,6 +107,8 @@ public abstract class VideoPlayer extends BasePlayer
 
     protected String playbackQuality;
 
+    private List<Subtitles> availableCaptions;
+
     protected boolean wasPlaying = false;
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -123,6 +137,11 @@ public abstract class VideoPlayer extends BasePlayer
     private View topControlsRoot;
     private TextView qualityTextView;
 
+    private SubtitleView subtitleView;
+
+    private TextView resizeView;
+    private TextView captionTextView;
+
     private ValueAnimator controlViewAnimator;
     private Handler controlsVisibilityHandler = new Handler();
 
@@ -133,6 +152,9 @@ public abstract class VideoPlayer extends BasePlayer
     private int playbackSpeedPopupMenuGroupId = 79;
     private PopupMenu playbackSpeedPopupMenu;
 
+    private int captionPopupMenuGroupId = 89;
+    private PopupMenu captionPopupMenu;
+
     ///////////////////////////////////////////////////////////////////////////
 
     public VideoPlayer(String debugTag, Context context) {
@@ -163,6 +185,12 @@ public abstract class VideoPlayer extends BasePlayer
         this.bottomControlsRoot = rootView.findViewById(R.id.bottomControls);
         this.topControlsRoot = rootView.findViewById(R.id.topControls);
         this.qualityTextView = rootView.findViewById(R.id.qualityTextView);
+        this.subtitleView = rootView.findViewById(R.id.subtitleView);
+
+        this.resizeView =  rootView.findViewById(R.id.resizeTextView);
+        resizeView.setText(PlayerHelper.resizeTypeOf(context, aspectRatioFrameLayout.getResizeMode()));
+
+        this.captionTextView = rootView.findViewById(R.id.captionTextView);
 
         //this.aspectRatioFrameLayout.setAspectRatio(16.0f / 9.0f);
 
@@ -172,9 +200,13 @@ public abstract class VideoPlayer extends BasePlayer
 
         this.qualityPopupMenu = new PopupMenu(context, qualityTextView);
         this.playbackSpeedPopupMenu = new PopupMenu(context, playbackSpeedTextView);
+        this.captionPopupMenu = new PopupMenu(context, captionTextView);
 
-        ((ProgressBar) this.loadingPanel.findViewById(R.id.progressBarLoadingPanel)).getIndeterminateDrawable().setColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY);
+        ((ProgressBar) this.loadingPanel.findViewById(R.id.progressBarLoadingPanel))
+                .getIndeterminateDrawable().setColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY);
 
+        subtitleView.setFixedTextSize(TypedValue.COMPLEX_UNIT_PX,
+                PlayerHelper.getCaptionSizePx(context));
     }
 
     @Override
@@ -183,14 +215,22 @@ public abstract class VideoPlayer extends BasePlayer
         playbackSeekBar.setOnSeekBarChangeListener(this);
         playbackSpeedTextView.setOnClickListener(this);
         qualityTextView.setOnClickListener(this);
+        captionTextView.setOnClickListener(this);
+        resizeView.setOnClickListener(this);
     }
 
     @Override
     public void initPlayer() {
         super.initPlayer();
+
+        // Setup video view
         simpleExoPlayer.setVideoSurfaceView(surfaceView);
         simpleExoPlayer.addVideoListener(this);
 
+        // Setup subtitle view
+        simpleExoPlayer.addTextOutput(cues -> subtitleView.onCues(cues));
+
+        // Setup audio session with onboard equalizer
         if (Build.VERSION.SDK_INT >= 21) {
             trackSelector.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context));
         }
@@ -236,6 +276,39 @@ public abstract class VideoPlayer extends BasePlayer
         playbackSpeedPopupMenu.setOnDismissListener(this);
     }
 
+    private void buildCaptionMenu() {
+        if (captionPopupMenu == null) return;
+        captionPopupMenu.getMenu().removeGroup(captionPopupMenuGroupId);
+
+        if (availableCaptions == null || trackSelector == null) return;
+        MenuItem captionOffItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId,
+                0, Menu.NONE, "Caption Off");
+        captionOffItem.setOnMenuItemClickListener(menuItem -> {
+            final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
+            if (trackSelector != null && textRendererIndex != -1) {
+                trackSelector.setRendererDisabled(textRendererIndex, true);
+            }
+            return true;
+        });
+
+        for (int i = 0; i < availableCaptions.size(); i++) {
+            final Subtitles subtitles = availableCaptions.get(i);
+            final String captionLanguage = PlayerHelper.captionLanguageOf(subtitles);
+            MenuItem captionItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId,
+                    i + 1, Menu.NONE, captionLanguage);
+            captionItem.setOnMenuItemClickListener(menuItem -> {
+                final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
+                if (trackSelector != null && textRendererIndex != -1) {
+                    trackSelector.setRendererDisabled(textRendererIndex, false);
+                    trackSelector.setParameters(trackSelector.getParameters()
+                            .withPreferredTextLanguage(captionLanguage));
+                }
+                return true;
+            });
+        }
+        //captionPopupMenu.setOnMenuItemClickListener(this);
+        captionPopupMenu.setOnDismissListener(this);
+    }
     /*//////////////////////////////////////////////////////////////////////////
     // Playback Listener
     //////////////////////////////////////////////////////////////////////////*/
@@ -249,9 +322,11 @@ public abstract class VideoPlayer extends BasePlayer
         super.sync(item, info);
         qualityTextView.setVisibility(View.GONE);
         playbackSpeedTextView.setVisibility(View.GONE);
+        captionTextView.setVisibility(View.GONE);
 
         if (info != null) {
-            final List<VideoStream> videos = ListHelper.getSortedStreamVideosList(context, info.video_streams, info.video_only_streams, false);
+            final List<VideoStream> videos = ListHelper.getSortedStreamVideosList(context,
+                    info.video_streams, info.video_only_streams, false);
             availableStreams = new ArrayList<>(videos);
             if (playbackQuality == null) {
                 selectedStreamIndex = getDefaultResolutionIndex(videos);
@@ -261,8 +336,12 @@ public abstract class VideoPlayer extends BasePlayer
 
             buildQualityMenu();
             buildPlaybackSpeedMenu();
+            buildCaptionMenu();
             qualityTextView.setVisibility(View.VISIBLE);
             playbackSpeedTextView.setVisibility(View.VISIBLE);
+
+            availableCaptions = info.getSubtitles();
+            if (!availableCaptions.isEmpty()) captionTextView.setVisibility(View.VISIBLE);
         }
     }
 
@@ -280,13 +359,39 @@ public abstract class VideoPlayer extends BasePlayer
         if (index < 0 || index >= videos.size()) return null;
         final VideoStream video = videos.get(index);
 
-        final MediaSource streamSource = buildMediaSource(video.getUrl(), MediaFormat.getSuffixById(video.format));
+        List<MediaSource> mediaSources = new ArrayList<>();
-        final AudioStream audio = ListHelper.getHighestQualityAudio(info.audio_streams);
+        // Create video stream source
-        if (!video.isVideoOnly || audio == null) return streamSource;
+        final MediaSource streamSource = buildMediaSource(video.getUrl(),
+                MediaFormat.getSuffixById(video.getFormatId()));
+        mediaSources.add(streamSource);
 
+        // Create optional audio stream source
+        final AudioStream audio = ListHelper.getHighestQualityAudio(info.audio_streams);
+        if (video.isVideoOnly && audio != null) {
             // Merge with audio stream in case if video does not contain audio
-        final MediaSource audioSource = buildMediaSource(audio.getUrl(), MediaFormat.getSuffixById(audio.format));
+            final MediaSource audioSource = buildMediaSource(audio.getUrl(),
-        return new MergingMediaSource(streamSource, audioSource);
+                    MediaFormat.getSuffixById(audio.getFormatId()));
+            mediaSources.add(audioSource);
+        }
+
+        // Create subtitle sources
+        for (final Subtitles subtitle : info.getSubtitles()) {
+            final String mimeType = PlayerHelper.mimeTypesOf(subtitle.getFileType());
+            if (mimeType == null) continue;
+
+            final Format textFormat = Format.createTextSampleFormat(null, mimeType,
+                    SELECTION_FLAG_AUTOSELECT, PlayerHelper.captionLanguageOf(subtitle));
+            final MediaSource textSource = new SingleSampleMediaSource(
+                    Uri.parse(subtitle.getURL()), cacheDataSourceFactory, textFormat, TIME_UNSET);
+            mediaSources.add(textSource);
+        }
+
+        if (mediaSources.size() == 1) {
+            return mediaSources.get(0);
+        } else {
+            return new MergingMediaSource(mediaSources.toArray(
+                    new MediaSource[mediaSources.size()]));
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -364,6 +469,20 @@ public abstract class VideoPlayer extends BasePlayer
     // ExoPlayer Video Listener
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+        super.onTracksChanged(trackGroups, trackSelections);
+        if (trackSelector == null || captionTextView == null) return;
+
+        if (trackSelector.getRendererDisabled(getRendererIndex(C.TRACK_TYPE_TEXT)) ||
+                trackSelector.getParameters().preferredTextLanguage == null) {
+            captionTextView.setText("No Caption");
+        } else {
+            final String preferredLanguage = trackSelector.getParameters().preferredTextLanguage;
+            captionTextView.setText(preferredLanguage);
+        }
+    }
+
     @Override
     public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) {
         if (DEBUG) {
@@ -453,6 +572,10 @@ public abstract class VideoPlayer extends BasePlayer
             onQualitySelectorClicked();
         } else if (v.getId() == playbackSpeedTextView.getId()) {
             onPlaybackSpeedClicked();
+        } else if (v.getId() == resizeView.getId()) {
+            onResizeClicked();
+        } else if (v.getId() == captionTextView.getId()) {
+            onCaptionClicked();
         }
     }
 
@@ -516,6 +639,27 @@ public abstract class VideoPlayer extends BasePlayer
         showControls(300);
     }
 
+    private void onCaptionClicked() {
+        if (DEBUG) Log.d(TAG, "onCaptionClicked() called");
+        captionPopupMenu.show();
+        isSomePopupMenuVisible = true;
+        showControls(300);
+    }
+
+    protected void onResizeClicked() {
+        if (aspectRatioFrameLayout != null && context != null) {
+            final int currentResizeMode = aspectRatioFrameLayout.getResizeMode();
+            final int newResizeMode;
+            if (currentResizeMode == AspectRatioFrameLayout.RESIZE_MODE_ZOOM) {
+                newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
+            } else {
+                newResizeMode = currentResizeMode + 1;
+            }
+
+            aspectRatioFrameLayout.setResizeMode(newResizeMode);
+            resizeView.setText(PlayerHelper.resizeTypeOf(context, newResizeMode));
+        }
+    }
     /*//////////////////////////////////////////////////////////////////////////
     // SeekBar Listener
     //////////////////////////////////////////////////////////////////////////*/
@@ -557,11 +701,11 @@ public abstract class VideoPlayer extends BasePlayer
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    public int getVideoRendererIndex() {
+    public int getRendererIndex(final int trackIndex) {
         if (simpleExoPlayer == null) return -1;
 
         for (int t = 0; t < simpleExoPlayer.getRendererCount(); t++) {
-            if (simpleExoPlayer.getRendererType(t) == C.TRACK_TYPE_VIDEO) {
+            if (simpleExoPlayer.getRendererType(t) == trackIndex) {
                 return t;
             }
         }

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -4,8 +4,14 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.util.DisplayMetrics;
+
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.Subtitles;
+import org.schabi.newpipe.extractor.stream.SubtitlesFormat;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -14,6 +20,12 @@ import java.util.Locale;
 
 import javax.annotation.Nonnull;
 
+import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FILL;
+import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
+import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIXED_HEIGHT;
+import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH;
+import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+
 public class PlayerHelper {
     private PlayerHelper() {}
 
@@ -46,6 +58,39 @@ public class PlayerHelper {
         return pitchFormatter.format(pitch);
     }
 
+    public static String mimeTypesOf(final SubtitlesFormat format) {
+        switch (format) {
+            case VTT: return MimeTypes.TEXT_VTT;
+            case TTML: return MimeTypes.APPLICATION_TTML;
+            default: throw new IllegalArgumentException("Unrecognized mime type: " + format.name());
+        }
+    }
+
+    @NonNull
+    public static String captionLanguageOf(@NonNull final Subtitles subtitles) {
+        final String displayName = subtitles.getLocale().getDisplayName(subtitles.getLocale());
+        return displayName + (subtitles.isAutoGenerated() ? " (auto-generated)" : "");
+    }
+
+    public static String resizeTypeOf(@NonNull final Context context,
+                                      @AspectRatioFrameLayout.ResizeMode final int resizeMode) {
+        switch (resizeMode) {
+            case RESIZE_MODE_FIT: return "FIT";
+            case RESIZE_MODE_FILL: return "FILL";
+            case RESIZE_MODE_FIXED_HEIGHT: return "HEIGHT";
+            case RESIZE_MODE_FIXED_WIDTH: return "WIDTH";
+            case RESIZE_MODE_ZOOM: return "ZOOM";
+            default: throw new IllegalArgumentException("Unrecognized resize mode: " + resizeMode);
+        }
+    }
+
+    public static float getCaptionSizePx(@NonNull final Context context) {
+        final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        final int minimumLength = Math.min(metrics.heightPixels, metrics.widthPixels);
+        // todo: expose size control to users
+        return (float) minimumLength / 20f;
+    }
+
     public static boolean isResumeAfterAudioFocusGain(@NonNull final Context context) {
         return isResumeAfterAudioFocusGain(context, false);
     }

app/src/main/res/layout/activity_main_player.xml

@@ -30,6 +30,12 @@
 
     </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
 
+    <com.google.android.exoplayer2.ui.SubtitleView
+        android:id="@+id/subtitleView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center"/>
 
     <ImageView
         android:id="@+id/endScreen"
@@ -146,6 +152,7 @@
                 tools:ignore="RtlHardcoded">
 
                 <LinearLayout
+                    android:id="@+id/metadataView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
@@ -247,6 +254,38 @@
                     android:src="@drawable/ic_more_vert_white_24dp"
                     tools:ignore="ContentDescription,RtlHardcoded"/>
 
+                <TextView
+                    android:id="@+id/resizeTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_below="@id/metadataView"
+                    android:layout_alignParentLeft="true"
+                    android:gravity="center"
+                    android:minWidth="50dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText,RtlHardcoded"
+                    tools:text="FIT"/>
+
+                <TextView
+                    android:id="@+id/captionTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_below="@id/metadataView"
+                    android:layout_toRightOf="@id/resizeTextView"
+                    android:gravity="center"
+                    android:minHeight="35dp"
+                    android:minWidth="40dp"
+                    android:paddingLeft="2dp"
+                    android:paddingRight="2dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    tools:ignore="RtlHardcoded,RtlSymmetry"
+                    tools:text="English" />
             </RelativeLayout>
 
             <LinearLayout
@@ -293,7 +332,6 @@
                     tools:ignore="HardcodedText"
                     tools:text="1:23:49"/>
             </LinearLayout>
-
         </RelativeLayout>
 
         <ImageButton

app/src/main/res/layout/player_popup.xml

@@ -28,6 +28,10 @@
             android:layout_height="match_parent"
             android:background="@android:color/black"/>
 
+        <com.google.android.exoplayer2.ui.SubtitleView
+            android:id="@+id/subtitleView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
     </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
 
 
@@ -97,6 +101,34 @@
                 android:src="@drawable/ic_fullscreen_white"
                 tools:ignore="ContentDescription,RtlHardcoded"/>
 
+            <TextView
+                android:id="@+id/resizeTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:padding="5dp"
+                android:layout_below="@id/qualityTextView"
+                android:layout_alignParentLeft="true"
+                android:gravity="center"
+                android:minWidth="50dp"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText,RtlHardcoded"
+                tools:text="FIT"/>
+
+            <TextView
+                android:id="@+id/captionTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:layout_below="@id/qualityTextView"
+                android:layout_toRightOf="@id/resizeTextView"
+                android:gravity="center"
+                android:minHeight="35dp"
+                android:minWidth="40dp"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                tools:ignore="RtlHardcoded,RtlSymmetry"
+                tools:text="English" />
         </RelativeLayout>
 
         <!--Shadow Bottom Control-->