From 84c9d290bb2de896dba9e4ffd1c05aad5c918f03 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Mon, 17 Jan 2022 08:28:16 -0700 Subject: [PATCH] Fix overwritten docs 67e1261 messed up some of the other docs. Fix that. --- docs/ad-insertion.md | 16 ++++++++-------- docs/hls.md | 1 + docs/transforming-media.md | 4 ++-- docs/troubleshooting.md | 12 ++++++------ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/docs/ad-insertion.md b/docs/ad-insertion.md index 369b4427fc..142de570a4 100644 --- a/docs/ad-insertion.md +++ b/docs/ad-insertion.md @@ -64,9 +64,9 @@ Internally, `DefaultMediaSourceFactory` will wrap the content media source in an `AdsLoader.Provider` and use it to insert ads as defined by the media item's ad tag. -ExoPlayer's `StyledPlayerView` and `PlayerView` UI components both -implement `AdViewProvider`. The IMA extension provides an easy to use -`AdsLoader`, as described below. +ExoPlayer's `StyledPlayerView` and `PlayerView` UI components both implement +`AdViewProvider`. The IMA extension provides an easy to use `AdsLoader`, as +described below. ### Playlists with ads ### @@ -123,8 +123,8 @@ VAST/VMAP ad tags in the sample list. #### UI considerations #### -`StyledPlayerView` and `PlayerView` hide controls during playback of ads -by default, but apps can toggle this behavior by calling +`StyledPlayerView` and `PlayerView` hide controls during playback of ads by +default, but apps can toggle this behavior by calling `setControllerHideDuringAds`, which is defined on both views. The IMA SDK will show additional views on top of the player while an ad is playing (e.g., a 'more info' link and a skip button, if applicable). @@ -139,9 +139,9 @@ The IMA SDK may report whether ads are obscured by application provided views rendered on top of the player. Apps that need to overlay views that are essential for controlling playback must register them with the IMA SDK so that they can be omitted from viewability calculations. When using `StyledPlayerView` -or `PlayerView` as the `AdViewProvider`, they will automatically register -their control overlays. Apps that use a custom player UI must register overlay -views by returning them from `AdViewProvider.getAdOverlayInfos`. +or `PlayerView` as the `AdViewProvider`, they will automatically register their +control overlays. Apps that use a custom player UI must register overlay views +by returning them from `AdViewProvider.getAdOverlayInfos`. For more information about overlay views, see [Open Measurement in the IMA SDK][]. diff --git a/docs/hls.md b/docs/hls.md index fbea55ff4e..5633ad8976 100644 --- a/docs/hls.md +++ b/docs/hls.md @@ -130,6 +130,7 @@ The following guidelines apply specifically for live streams: [HlsMediaSource]: {{ site.exo_sdk }}/source/hls/HlsMediaSource.html [HTTP Live Streaming]: https://tools.ietf.org/html/rfc8216 +[PlayerView]: {{ site.exo_sdk }}/ui/PlayerView.html [UI components]: {{ site.baseurl }}/ui-components.html [Customization page]: {{ site.baseurl }}/customization.html [Medium post about HLS playback in ExoPlayer]: https://medium.com/google-exoplayer/hls-playback-in-exoplayer-a33959a47be7 diff --git a/docs/transforming-media.md b/docs/transforming-media.md index 81f54a8656..a3c112f77a 100644 --- a/docs/transforming-media.md +++ b/docs/transforming-media.md @@ -34,7 +34,7 @@ transformation that removes the audio track from the input: Transformer transformer = new Transformer.Builder(context) .setRemoveAudio(true) - .addListener(transformerListener) + .setListener(transformerListener) .build(); // Start the transformation. transformer.startTransformation(inputMediaItem, outputPath); @@ -121,7 +121,7 @@ method. Transformer transformer = new Transformer.Builder(context) .setFlattenForSlowMotion(true) - .addListener(transformerListener) + .setListener(transformerListener) .build(); transformer.startTransformation(inputMediaItem, outputPath); ~~~ diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 0840c6b523..80c922b615 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -6,7 +6,7 @@ redirect_from: --- * [Fixing "Cleartext HTTP traffic not permitted" errors][] -* [Fixing "SSLHandshakeException", "CertPathValidatorException" and "ERR_CERT_AUTHORITY_INVALID" errors][] +* [Fixing "SSLHandshakeException" and "CertPathValidatorException" errors][] * [Why are some media files not seekable?][] * [Why is seeking inaccurate in some MP3 files?][] * [Why do some MPEG-TS files fail to play?][] @@ -43,11 +43,11 @@ The ExoPlayer demo app uses the default Network Security Configuration, and so does not allow cleartext HTTP traffic. You can enable it using the instructions above. -#### Fixing "SSLHandshakeException", "CertPathValidatorException" and "ERR_CERT_AUTHORITY_INVALID" errors #### +#### Fixing "SSLHandshakeException" and "CertPathValidatorException" errors #### -`SSLHandshakeException`, `CertPathValidatorException` and -`ERR_CERT_AUTHORITY_INVALID` all indicate a problem with the server's SSL -certificate. These errors are not ExoPlayer specific. Please see +`SSLHandshakeException` and `CertPathValidatorException` both indicate a problem +with the server's SSL certificate. These errors are not ExoPlayer specific. +Please see [Android's SSL documentation](https://developer.android.com/training/articles/security-ssl#CommonProblems) for more details. @@ -294,7 +294,7 @@ Android Player API](https://developers.google.com/youtube/android/player/) which is the official way to play YouTube videos on Android. [Fixing "Cleartext HTTP traffic not permitted" errors]: #fixing-cleartext-http-traffic-not-permitted-errors -[Fixing "SSLHandshakeException", "CertPathValidatorException" and "ERR_CERT_AUTHORITY_INVALID" errors]: #fixing-sslhandshakeexception-certpathvalidatorexception-and-err_cert_authority_invalid-errors +[Fixing "SSLHandshakeException" and "CertPathValidatorException" errors]: #fixing-sslhandshakeexception-and-certpathvalidatorexception-errors [What formats does ExoPlayer support?]: #what-formats-does-exoplayer-support [Why are some media files not seekable?]: #why-are-some-media-files-not-seekable [Why is seeking inaccurate in some MP3 files?]: #why-is-seeking-inaccurate-in-some-mp3-files