Commit 8d0c4b1b by olly Committed by Oliver Woodman

Fix some Javadoc

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=211352749
parent 3a802eb0
...@@ -22,6 +22,7 @@ import android.view.Surface; ...@@ -22,6 +22,7 @@ import android.view.Surface;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.TextureView; import android.view.TextureView;
import com.google.android.exoplayer2.C.VideoScalingMode;
import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.audio.AudioListener; import com.google.android.exoplayer2.audio.AudioListener;
import com.google.android.exoplayer2.audio.AuxEffectInfo; import com.google.android.exoplayer2.audio.AuxEffectInfo;
...@@ -143,14 +144,14 @@ public interface Player { ...@@ -143,14 +144,14 @@ public interface Player {
interface VideoComponent { interface VideoComponent {
/** /**
* Sets the video scaling mode. * Sets the {@link @VideoScalingMode}.
* *
* @param videoScalingMode The video scaling mode. * @param videoScalingMode The {@link @VideoScalingMode}.
*/ */
void setVideoScalingMode(@C.VideoScalingMode int videoScalingMode); void setVideoScalingMode(@VideoScalingMode int videoScalingMode);
/** Returns the video scaling mode. */ /** Returns the {@link @VideoScalingMode}. */
@C.VideoScalingMode @VideoScalingMode
int getVideoScalingMode(); int getVideoScalingMode();
/** /**
......
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.trackselection; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.trackselection;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.chunk.MediaChunk; import com.google.android.exoplayer2.source.chunk.MediaChunk;
...@@ -60,7 +61,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection { ...@@ -60,7 +61,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
/** /**
* @deprecated Use {@link #Factory()} instead. Custom bandwidth meter should be directly passed * @deprecated Use {@link #Factory()} instead. Custom bandwidth meter should be directly passed
* to the player in ExoPlayerFactory. * to the player in {@link ExoPlayerFactory}.
*/ */
@Deprecated @Deprecated
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
...@@ -108,7 +109,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection { ...@@ -108,7 +109,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
/** /**
* @deprecated Use {@link #Factory(int, int, int, float)} instead. Custom bandwidth meter should * @deprecated Use {@link #Factory(int, int, int, float)} instead. Custom bandwidth meter should
* be directly passed to the player in ExoPlayerFactory. * be directly passed to the player in {@link ExoPlayerFactory}.
*/ */
@Deprecated @Deprecated
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
...@@ -177,7 +178,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection { ...@@ -177,7 +178,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
/** /**
* @deprecated Use {@link #Factory(int, int, int, float, float, long, Clock)} instead. Custom * @deprecated Use {@link #Factory(int, int, int, float, float, long, Clock)} instead. Custom
* bandwidth meter should be directly passed to the player in ExoPlayerFactory. * bandwidth meter should be directly passed to the player in {@link ExoPlayerFactory}.
*/ */
@Deprecated @Deprecated
public Factory( public Factory(
......
...@@ -27,6 +27,7 @@ import android.util.SparseArray; ...@@ -27,6 +27,7 @@ import android.util.SparseArray;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
...@@ -1092,7 +1093,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1092,7 +1093,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
/** /**
* @deprecated Use {@link #DefaultTrackSelector()} instead. Custom bandwidth meter should be * @deprecated Use {@link #DefaultTrackSelector()} instead. Custom bandwidth meter should be
* directly passed to the player in ExoPlayerFactory. * directly passed to the player in {@link ExoPlayerFactory}.
*/ */
@Deprecated @Deprecated
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
......
...@@ -140,17 +140,15 @@ public final class AspectRatioFrameLayout extends FrameLayout { ...@@ -140,17 +140,15 @@ public final class AspectRatioFrameLayout extends FrameLayout {
this.aspectRatioListener = listener; this.aspectRatioListener = listener;
} }
/** /** Returns the {@link ResizeMode}. */
* Returns the resize mode.
*/
public @ResizeMode int getResizeMode() { public @ResizeMode int getResizeMode() {
return resizeMode; return resizeMode;
} }
/** /**
* Sets the resize mode. * Sets the {@link ResizeMode}
* *
* @param resizeMode The resize mode. * @param resizeMode The {@link ResizeMode}.
*/ */
public void setResizeMode(@ResizeMode int resizeMode) { public void setResizeMode(@ResizeMode int resizeMode) {
if (this.resizeMode != resizeMode) { if (this.resizeMode != resizeMode) {
......
...@@ -566,16 +566,16 @@ public class PlayerView extends FrameLayout { ...@@ -566,16 +566,16 @@ public class PlayerView extends FrameLayout {
} }
/** /**
* Sets the resize mode. * Sets the {@link ResizeMode}.
* *
* @param resizeMode The resize mode. * @param resizeMode The {@link ResizeMode}.
*/ */
public void setResizeMode(@ResizeMode int resizeMode) { public void setResizeMode(@ResizeMode int resizeMode) {
Assertions.checkState(contentFrame != null); Assertions.checkState(contentFrame != null);
contentFrame.setResizeMode(resizeMode); contentFrame.setResizeMode(resizeMode);
} }
/** Returns the resize mode. */ /** Returns the {@link ResizeMode}. */
public @ResizeMode int getResizeMode() { public @ResizeMode int getResizeMode() {
Assertions.checkState(contentFrame != null); Assertions.checkState(contentFrame != null);
return contentFrame.getResizeMode(); return contentFrame.getResizeMode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment