From bd6570f6c7be96afb82f3f1d97f6ba07bf312002 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 17 Nov 2022 17:37:48 +0000 Subject: [PATCH] Remove @hide javadoc annotation from ExoPlayer GitHub This tag is only understood by Dackka, which is used to generate the media3 javadoc. PiperOrigin-RevId: 489233200 (cherry picked from commit 058cba95d40db83c77f4dd0aa8cb561221463b3a) --- .../ext/av1/Libgav1VideoRenderer.java | 6 +----- .../ext/ffmpeg/FfmpegAudioRenderer.java | 12 ++---------- .../ext/flac/LibflacAudioRenderer.java | 12 ++---------- .../ext/opus/LibopusAudioRenderer.java | 12 ++---------- javadoc_combined.gradle | 1 - .../source/ConcatenatingMediaSource.java | 18 +++--------------- 6 files changed, 10 insertions(+), 51 deletions(-) diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java index 22b542843d..d707e580ce 100644 --- a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java +++ b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java @@ -138,11 +138,7 @@ public class Libgav1VideoRenderer extends DecoderVideoRenderer { C.FORMAT_HANDLED, ADAPTIVE_SEAMLESS, TUNNELING_NOT_SUPPORTED); } - /** - * {@inheritDoc} - * - * @hide - */ + /** {@inheritDoc} */ @Override protected final Gav1Decoder createDecoder(Format format, @Nullable CryptoConfig cryptoConfig) throws Gav1DecoderException { diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java index 186c1f10ce..23a601c0db 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java @@ -108,11 +108,7 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer { } } - /** - * {@inheritDoc} - * - * @hide - */ + /** {@inheritDoc} */ @Override protected final OpusDecoder createDecoder(Format format, @Nullable CryptoConfig cryptoConfig) throws OpusDecoderException { @@ -124,11 +120,7 @@ public class LibopusAudioRenderer extends DecoderAudioRenderer { return decoder; } - /** - * {@inheritDoc} g - * - * @hide - */ + /** {@inheritDoc} */ @Override protected final Format getOutputFormat(OpusDecoder decoder) { @C.PcmEncoding diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle index b57a6fc2a0..5d6848fc47 100644 --- a/javadoc_combined.gradle +++ b/javadoc_combined.gradle @@ -39,7 +39,6 @@ class CombinedJavadocPlugin implements Plugin { options { links "https://developer.android.com/reference", guavaReferenceUrl encoding = "UTF-8" - tags = ["hide"] } options.addBooleanOption "-no-module-directories", true exclude "**/BuildConfig.java" diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java index aa26f34df6..60548f930e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java @@ -526,22 +526,14 @@ public final class ConcatenatingMediaSource extends CompositeMediaSource