diff --git a/docs/doc/reference/com/google/android/exoplayer2/drm/UnsupportedDrmException.Reason.html b/docs/doc/reference/com/google/android/exoplayer2/drm/UnsupportedDrmException.Reason.html index 37b0e6d8fa..3e903ba28b 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/drm/UnsupportedDrmException.Reason.html +++ b/docs/doc/reference/com/google/android/exoplayer2/drm/UnsupportedDrmException.Reason.html @@ -114,6 +114,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); 
  • @Documented
+@Retention(SOURCE)
 @Target({FIELD,METHOD,PARAMETER,LOCAL_VARIABLE,TYPE_USE})
 public static @interface UnsupportedDrmException.Reason
    The reason for the exception. One of UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME or UnsupportedDrmException.REASON_INSTANTIATION_ERROR.
    diff --git a/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.Factory.html b/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.Factory.html index 883a62d99c..b2956b1f65 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.Factory.html +++ b/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.Factory.html @@ -143,9 +143,7 @@ implements Factory for creating ImaServerSideAdInsertionMediaSources.

    Apps can use the ImaServerSideAdInsertionMediaSource.Factory to customized the - DefaultMediaSourceFactory that is used to build a player: - -

    TODO(bachinger) add code snippet from PlayerActivity + DefaultMediaSourceFactory that is used to build a player:

    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.html b/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.html index b817c01463..04bdcf4b60 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.html +++ b/docs/doc/reference/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.html @@ -145,9 +145,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); 
    public final class ImaServerSideAdInsertionMediaSource
 extends CompositeMediaSource<Void>
    -
    MediaSource for IMA server side inserted ad streams. - -

    TODO(bachinger) add code snippet from PlayerActivity

    +
    MediaSource for IMA server side inserted ad streams.
    diff --git a/docs/doc/reference/com/google/android/exoplayer2/source/SingleSampleMediaSource.Factory.html b/docs/doc/reference/com/google/android/exoplayer2/source/SingleSampleMediaSource.Factory.html index 13f64d6167..d6fbd26afc 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/source/SingleSampleMediaSource.Factory.html +++ b/docs/doc/reference/com/google/android/exoplayer2/source/SingleSampleMediaSource.Factory.html @@ -25,8 +25,8 @@ catch(err) { } //--> -var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10}; -var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; +var data = {"i0":10,"i1":10,"i2":10,"i3":42,"i4":10}; +var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; var tableTab = "tableTab"; @@ -173,7 +173,7 @@ extends

    Method Summary

    - + @@ -206,7 +206,10 @@ extends SingleSampleMediaSource.Factory @@ -290,15 +293,14 @@ extends

  • setTrackId

    -
    public SingleSampleMediaSource.Factory setTrackId​(@Nullable
+
    @Deprecated
+public SingleSampleMediaSource.Factory setTrackId​(@Nullable
                                                   String trackId)
    
-
    Sets an optional track id to be used.
    
-
    
-
    Parameters:
    
-
    trackId - An optional track id.
    
-
    Returns:
    
-
    This factory, for convenience.
    
-
    
+
    Deprecated.
+
    Use MediaItem.SubtitleConfiguration.Builder.setId(String) instead (on the
+     MediaItem.SubtitleConfiguration passed to createMediaSource(MediaItem.SubtitleConfiguration, long)). trackId will only be
+     used if MediaItem.SubtitleConfiguration.id is null.
    
+
    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/ui/StyledPlayerView.html b/docs/doc/reference/com/google/android/exoplayer2/ui/StyledPlayerView.html index 97ef258e19..181a38fca3 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/ui/StyledPlayerView.html +++ b/docs/doc/reference/com/google/android/exoplayer2/ui/StyledPlayerView.html @@ -231,21 +231,9 @@ implements setKeepContentOnPlayerReset(boolean)
  • Default: false -
  • player_layout_id - Specifies the id of the layout to be inflated. See below - for more details. - -
  • controller_layout_id - Specifies the id of the layout resource to be - inflated by the child StyledPlayerControlView. See below for more details. -
  • All attributes that can be set on StyledPlayerControlView and DefaultTimeBar can also be set on a StyledPlayerView, and will be propagated to the inflated StyledPlayerControlView unless the layout is overridden to specify a - custom exo_controller (see below). + custom exo_controller.

    Overriding drawables

    diff --git a/docs/doc/reference/constant-values.html b/docs/doc/reference/constant-values.html index afefe55664..d54548afd4 100644 --- a/docs/doc/reference/constant-values.html +++ b/docs/doc/reference/constant-values.html @@ -1855,21 +1855,21 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); public static final String
    • - + - + - +
    All Methods Instance Methods Concrete Methods All Methods Instance Methods Concrete Methods Deprecated Methods 
    Modifier and Type Method setTrackId​(String trackId) -
    Sets an optional track id to be used.
    +
    Deprecated. +
    Use MediaItem.SubtitleConfiguration.Builder.setId(String) instead (on the + MediaItem.SubtitleConfiguration passed to createMediaSource(MediaItem.SubtitleConfiguration, long)).
    +
    VERSION"2.16.1""2.17.1"
    public static final int VERSION_INT20160012017001
    public static final String VERSION_SLASHY"ExoPlayerLib/2.16.1""ExoPlayerLib/2.17.1"
    diff --git a/docs/doc/reference/deprecated-list.html b/docs/doc/reference/deprecated-list.html index 8c4333d648..f50dc183fb 100644 --- a/docs/doc/reference/deprecated-list.html +++ b/docs/doc/reference/deprecated-list.html @@ -1694,134 +1694,142 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); +com.google.android.exoplayer2.source.SingleSampleMediaSource.Factory.setTrackId​(String) + +
    Use MediaItem.SubtitleConfiguration.Builder.setId(String) instead (on the + MediaItem.SubtitleConfiguration passed to SingleSampleMediaSource.Factory.createMediaSource(MediaItem.SubtitleConfiguration, long)). trackId will only be + used if MediaItem.SubtitleConfiguration.id is null.
    + + + com.google.android.exoplayer2.testutil.StubExoPlayer.getAudioComponent() - + com.google.android.exoplayer2.testutil.StubExoPlayer.getDeviceComponent() - + com.google.android.exoplayer2.testutil.StubExoPlayer.getTextComponent() - + com.google.android.exoplayer2.testutil.StubExoPlayer.getVideoComponent() - + com.google.android.exoplayer2.testutil.StubExoPlayer.prepare​(MediaSource) - + com.google.android.exoplayer2.testutil.StubExoPlayer.retry() - + com.google.android.exoplayer2.testutil.StubExoPlayer.setHandleWakeLock​(boolean) - + com.google.android.exoplayer2.testutil.StubPlayer.stop​(boolean) - + com.google.android.exoplayer2.Timeline.getPeriodPosition​(Timeline.Window, Timeline.Period, int, long)
    Use Timeline.getPeriodPositionUs(Window, Period, int, long) instead.
    - + com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Parameters.getSelectionOverride​(int, TrackGroupArray)
    Only works to retrieve the overrides set with the deprecated DefaultTrackSelector.ParametersBuilder.setSelectionOverride(int, TrackGroupArray, SelectionOverride). Use TrackSelectionParameters.trackSelectionOverrides instead.
    - + com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Parameters.hasSelectionOverride​(int, TrackGroupArray)
    Only works to retrieve the overrides set with the deprecated DefaultTrackSelector.ParametersBuilder.setSelectionOverride(int, TrackGroupArray, SelectionOverride). Use TrackSelectionParameters.trackSelectionOverrides instead.
    - + com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder.clearSelectionOverride​(int, TrackGroupArray)
    Use TrackSelectionParameters.Builder.setTrackSelectionOverrides(com.google.android.exoplayer2.trackselection.TrackSelectionOverrides).
    - + com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder.clearSelectionOverrides​(int)
    Use TrackSelectionParameters.Builder.setTrackSelectionOverrides(com.google.android.exoplayer2.trackselection.TrackSelectionOverrides).
    - + com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder.setSelectionOverride​(int, TrackGroupArray, DefaultTrackSelector.SelectionOverride)
    Use TrackSelectionParameters.Builder.setTrackSelectionOverrides(com.google.android.exoplayer2.trackselection.TrackSelectionOverrides).
    - + com.google.android.exoplayer2.transformer.Transformer.Builder.setContext​(Context)
    Use Builder(Context) instead.
    - + com.google.android.exoplayer2.transformer.Transformer.Builder.setFlattenForSlowMotion​(boolean)
    Use TransformationRequest.Builder.setFlattenForSlowMotion(boolean) instead.
    - + com.google.android.exoplayer2.transformer.Transformer.Builder.setListener​(Transformer.Listener)
    Use Transformer.Builder.addListener(Listener), Transformer.Builder.removeListener(Listener) or Transformer.Builder.removeAllListeners() instead.
    - + com.google.android.exoplayer2.transformer.Transformer.Builder.setOutputMimeType​(String)
    This feature will be removed in a following release and the MIME type of the output will always be MP4.
    - + com.google.android.exoplayer2.transformer.Transformer.Listener.onTransformationError​(MediaItem, Exception)
    Use Transformer.Listener.onTransformationError(MediaItem, TransformationException).
    - + com.google.android.exoplayer2.transformer.Transformer.setListener​(Transformer.Listener)
    Use Transformer.addListener(Listener), Transformer.removeListener(Listener) or Transformer.removeAllListeners() instead.
    - + com.google.android.exoplayer2.ui.DownloadNotificationHelper.buildProgressNotification​(Context, int, PendingIntent, String, List<Download>)
    Use DownloadNotificationHelper.buildProgressNotification(Context, int, PendingIntent, String, List, int).
    - + com.google.android.exoplayer2.upstream.DefaultHttpDataSource.setContentTypePredicate​(Predicate<String>)
    Use DefaultHttpDataSource.Factory.setContentTypePredicate(Predicate) instead.
    - + com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView.getVideoDecoderOutputBufferRenderer()
    This class implements VideoDecoderOutputBufferRenderer directly.
    - + com.google.android.exoplayer2.video.VideoRendererEventListener.onVideoInputFormatChanged​(Format)
    Use VideoRendererEventListener.onVideoInputFormatChanged(Format, DecoderReuseEvaluation).
    diff --git a/docs/doc/reference/index-all.html b/docs/doc/reference/index-all.html index ae03f485c7..9b5179ddb6 100644 --- a/docs/doc/reference/index-all.html +++ b/docs/doc/reference/index-all.html @@ -36311,7 +36311,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    setTrackId(String) - Method in class com.google.android.exoplayer2.source.SingleSampleMediaSource.Factory
    -
    Sets an optional track id to be used.
    +
    Deprecated. +
    Use MediaItem.SubtitleConfiguration.Builder.setId(String) instead (on the + MediaItem.SubtitleConfiguration passed to SingleSampleMediaSource.Factory.createMediaSource(MediaItem.SubtitleConfiguration, long)). trackId will only be + used if MediaItem.SubtitleConfiguration.id is null.
    +
    setTrackNameProvider(TrackNameProvider) - Method in class com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder
    diff --git a/docs/doc/reference/member-search-index.zip b/docs/doc/reference/member-search-index.zip index fd73dec164..1466651513 100644 Binary files a/docs/doc/reference/member-search-index.zip and b/docs/doc/reference/member-search-index.zip differ diff --git a/docs/doc/reference/package-search-index.zip b/docs/doc/reference/package-search-index.zip index 3b8c2bb2ed..11de66a2c3 100644 Binary files a/docs/doc/reference/package-search-index.zip and b/docs/doc/reference/package-search-index.zip differ diff --git a/docs/doc/reference/type-search-index.zip b/docs/doc/reference/type-search-index.zip index d31bc35556..53e8efe12c 100644 Binary files a/docs/doc/reference/type-search-index.zip and b/docs/doc/reference/type-search-index.zip differ