diff --git a/docs/ad-insertion.md b/docs/ad-insertion.md index 142de570a4..369b4427fc 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/doc/reference/allclasses-index.html b/docs/doc/reference/allclasses-index.html index cababc66cd..1c58512cde 100644 --- a/docs/doc/reference/allclasses-index.html +++ b/docs/doc/reference/allclasses-index.html @@ -5055,7 +5055,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); -PictureFrame +PictureFrame
A picture parsed from a FLAC file.
@@ -7144,7 +7144,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); -VorbisComment +VorbisComment
A vorbis comment.
diff --git a/docs/doc/reference/allclasses.html b/docs/doc/reference/allclasses.html index 5655dd1704..5d8782d8f4 100644 --- a/docs/doc/reference/allclasses.html +++ b/docs/doc/reference/allclasses.html @@ -830,7 +830,7 @@
  • Period
  • PesReader
  • PgsDecoder
    • -
  • PictureFrame
    • +
  • PictureFrame
  • PlatformScheduler
  • PlatformScheduler.PlatformSchedulerService
  • PlaybackException
    • @@ -1174,7 +1174,7 @@
  • VideoRendererEventListener.EventDispatcher
  • VideoSize
  • VorbisBitArray
    • -
  • VorbisComment
    • +
  • VorbisComment
  • VorbisUtil
  • VorbisUtil.CommentHeader
  • VorbisUtil.Mode
    • diff --git a/docs/doc/reference/allpackages-index.html b/docs/doc/reference/allpackages-index.html index 9eaee16bde..aa307180e2 100644 --- a/docs/doc/reference/allpackages-index.html +++ b/docs/doc/reference/allpackages-index.html @@ -248,7 +248,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));   -com.google.android.exoplayer2.metadata.vorbis +com.google.android.exoplayer2.metadata.flac   diff --git a/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html b/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html index c0ce46b333..db7ab94849 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html +++ b/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html @@ -307,7 +307,7 @@ extends ArrayList<String> vorbisComments, - ArrayList<PictureFrame> pictureFrames) + ArrayList<PictureFrame> pictureFrames)   @@ -330,7 +330,7 @@ extends FlacStreamMetadata -copyWithPictureFrames​(List<PictureFrame> pictureFrames) +copyWithPictureFrames​(List<PictureFrame> pictureFrames)
    Returns a copy of this with the given picture frames added to the metadata.
    @@ -601,7 +601,7 @@ public final ArrayList<String> vorbisComments, - ArrayList<PictureFrame> pictureFrames) + ArrayList<PictureFrame> pictureFrames) @@ -733,7 +733,7 @@ public 

  • copyWithPictureFrames

    -
    public FlacStreamMetadata copyWithPictureFrames​(List<PictureFrame> pictureFrames)
    +
    public FlacStreamMetadata copyWithPictureFrames​(List<PictureFrame> pictureFrames)
    Returns a copy of this with the given picture frames added to the metadata.
    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html index 81b0ec8aba..c4938c36c7 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html @@ -126,7 +126,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    All Known Implementing Classes:
    -
    ApicFrame, AppInfoTable, BinaryFrame, ChapterFrame, ChapterTocFrame, CommentFrame, EventMessage, FakeMetadataEntry, GeobFrame, HlsTrackMetadataEntry, IcyHeaders, IcyInfo, Id3Frame, InternalFrame, MdtaMetadataEntry, MlltFrame, MotionPhotoMetadata, PictureFrame, PrivateCommand, PrivFrame, SlowMotionData, SmtaMetadataEntry, SpliceCommand, SpliceInsertCommand, SpliceNullCommand, SpliceScheduleCommand, TextInformationFrame, TimeSignalCommand, UrlLinkFrame, VorbisComment
    +
    ApicFrame, AppInfoTable, BinaryFrame, ChapterFrame, ChapterTocFrame, CommentFrame, EventMessage, FakeMetadataEntry, GeobFrame, HlsTrackMetadataEntry, IcyHeaders, IcyInfo, Id3Frame, InternalFrame, MdtaMetadataEntry, MlltFrame, MotionPhotoMetadata, PictureFrame, PrivateCommand, PrivFrame, SlowMotionData, SmtaMetadataEntry, SpliceCommand, SpliceInsertCommand, SpliceNullCommand, SpliceScheduleCommand, TextInformationFrame, TimeSignalCommand, UrlLinkFrame, VorbisComment
    Enclosing class:
    diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html index 94b75d4485..b275775151 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html @@ -113,7 +113,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -
    Package com.google.android.exoplayer2.metadata.vorbis
    +
    Package com.google.android.exoplayer2.metadata.flac

    Class PictureFrame

    @@ -121,7 +121,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  • java.lang.Object
    • -
    • com.google.android.exoplayer2.metadata.vorbis.PictureFrame
      • +
    • com.google.android.exoplayer2.metadata.flac.PictureFrame
    • @@ -182,7 +182,7 @@ implements -static Parcelable.Creator<PictureFrame> +static Parcelable.Creator<PictureFrame> CREATOR   @@ -438,7 +438,7 @@ implements

  • CREATOR

    -
    public static final Parcelable.Creator<PictureFrame> CREATOR
    +
    public static final Parcelable.Creator<PictureFrame> CREATOR
    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html index ef34ac9012..86d3cb8d33 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html @@ -113,7 +113,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -
    Package com.google.android.exoplayer2.metadata.vorbis
    +
    Package com.google.android.exoplayer2.metadata.flac

    Class VorbisComment

    @@ -121,7 +121,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  • java.lang.Object
    • -
    • com.google.android.exoplayer2.metadata.vorbis.VorbisComment
      • +
    • com.google.android.exoplayer2.metadata.flac.VorbisComment
    • @@ -175,7 +175,7 @@ implements Description -static Parcelable.Creator<VorbisComment> +static Parcelable.Creator<VorbisComment> CREATOR   @@ -330,7 +330,7 @@ implements

  • CREATOR

    -
    public static final Parcelable.Creator<VorbisComment> CREATOR
    +
    public static final Parcelable.Creator<VorbisComment> CREATOR
    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html index 17fb210e79..3917332abe 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html @@ -19,15 +19,15 @@ +var pathtoroot = "../../../../../../"; +var useModuleDirectories = false; +loadScripts(document, 'script'); @@ -91,7 +91,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -

    Package com.google.android.exoplayer2.metadata.vorbis

    +

    Package com.google.android.exoplayer2.metadata.flac

      @@ -104,13 +104,13 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); -PictureFrame +PictureFrame
      A picture parsed from a FLAC file.
      -VorbisComment +VorbisComment
      A vorbis comment.
      diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html index 8b4f6c8768..8587f7f8aa 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html @@ -19,15 +19,15 @@ +var pathtoroot = "../../../../../../"; +var useModuleDirectories = false; +loadScripts(document, 'script'); @@ -91,7 +91,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
      -

      Hierarchy For Package com.google.android.exoplayer2.metadata.vorbis

      +

      Hierarchy For Package com.google.android.exoplayer2.metadata.flac

      Package Hierarchies:
    • com.google.android.exoplayer2.extractor.VorbisBitArray
      • -
    • com.google.android.exoplayer2.metadata.flac.VorbisComment (implements com.google.android.exoplayer2.metadata.Metadata.Entry)
      • +
    • com.google.android.exoplayer2.metadata.flac.VorbisComment (implements com.google.android.exoplayer2.metadata.Metadata.Entry)
    • com.google.android.exoplayer2.extractor.VorbisUtil
    • com.google.android.exoplayer2.extractor.VorbisUtil.CommentHeader
    • com.google.android.exoplayer2.extractor.VorbisUtil.Mode
      • diff --git a/docs/hls.md b/docs/hls.md index 5633ad8976..fbea55ff4e 100644 --- a/docs/hls.md +++ b/docs/hls.md @@ -130,7 +130,6 @@ 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 a3c112f77a..81f54a8656 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) - .setListener(transformerListener) + .addListener(transformerListener) .build(); // Start the transformation. transformer.startTransformation(inputMediaItem, outputPath); @@ -121,7 +121,7 @@ method. Transformer transformer = new Transformer.Builder(context) .setFlattenForSlowMotion(true) - .setListener(transformerListener) + .addListener(transformerListener) .build(); transformer.startTransformation(inputMediaItem, outputPath); ~~~ diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 80c922b615..0840c6b523 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -6,7 +6,7 @@ redirect_from: --- * [Fixing "Cleartext HTTP traffic not permitted" errors][] -* [Fixing "SSLHandshakeException" and "CertPathValidatorException" errors][] +* [Fixing "SSLHandshakeException", "CertPathValidatorException" and "ERR_CERT_AUTHORITY_INVALID" 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" and "CertPathValidatorException" errors #### +#### Fixing "SSLHandshakeException", "CertPathValidatorException" and "ERR_CERT_AUTHORITY_INVALID" errors #### -`SSLHandshakeException` and `CertPathValidatorException` both indicate a problem -with the server's SSL certificate. These errors are not ExoPlayer specific. -Please see +`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 [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" and "CertPathValidatorException" errors]: #fixing-sslhandshakeexception-and-certpathvalidatorexception-errors +[Fixing "SSLHandshakeException", "CertPathValidatorException" and "ERR_CERT_AUTHORITY_INVALID" errors]: #fixing-sslhandshakeexception-certpathvalidatorexception-and-err_cert_authority_invalid-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