sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-25 09:25:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make copybara remove the LINT.IfChange tag

Browse source 
PiperOrigin-RevId: 371135534
This commit is contained in:
bachinger 2021-04-29 17:24:52 +01:00
parent a695cbd2ca
commit cdff456621
21 changed files with 1 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASENOTES.md
View file

@ -47,6 +47,7 @@
visibility in order to allow Kotlin subclasses of
`AdaptiveTrackSelection.Factory`
([#8830](https://github.com/google/ExoPlayer/issues/8830)).
* Hide LINT.IfChange tags in public sources.
* UI:
* Add builder for `PlayerNotificationManager`.
* Add group setting to `PlayerNotificationManager`.

2
extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java
View file

@ -34,11 +34,9 @@ import java.nio.ByteBuffer;
public final class Gav1Decoder
extends SimpleDecoder<VideoDecoderInputBuffer, VideoDecoderOutputBuffer, Gav1DecoderException> {
// LINT.IfChange
private static final int GAV1_ERROR = 0;
private static final int GAV1_OK = 1;
private static final int GAV1_DECODE_ONLY = 2;
// LINT.ThenChange(../../../../../../../jni/gav1_jni.cc)
private final long gav1DecoderContext;

6
extensions/av1/src/main/jni/gav1_jni.cc
View file

@ -69,22 +69,16 @@ const int kMaxPlanes = 3;
// https://developer.android.com/reference/android/graphics/ImageFormat.html#YV12.
const int kImageFormatYV12 = 0x32315659;
// LINT.IfChange
// Output modes.
const int kOutputModeYuv = 0;
const int kOutputModeSurfaceYuv = 1;
// LINT.ThenChange(../../../../../library/common/src/main/java/com/google/android/exoplayer2/C.java)
// LINT.IfChange
const int kColorSpaceUnknown = 0;
// LINT.ThenChange(../../../../../library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java)
// LINT.IfChange
// Return codes for jni methods.
const int kStatusError = 0;
const int kStatusOk = 1;
const int kStatusDecodeOnly = 2;
// LINT.ThenChange(../java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java)
// Status codes specific to the JNI wrapper code.
enum JniStatusCode {

2
extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioDecoder.java
View file

@ -36,10 +36,8 @@ import java.util.List;
private static final int OUTPUT_BUFFER_SIZE_16BIT = 65536;
private static final int OUTPUT_BUFFER_SIZE_32BIT = OUTPUT_BUFFER_SIZE_16BIT * 2;
// LINT.IfChange
private static final int AUDIO_DECODER_ERROR_INVALID_DATA = -1;
private static final int AUDIO_DECODER_ERROR_OTHER = -2;
// LINT.ThenChange(../../../../../../../jni/ffmpeg_jni.cc)
private final String codecName;
@Nullable private final byte[] extraData;

2
extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
View file

@ -63,10 +63,8 @@ static const AVSampleFormat OUTPUT_FORMAT_PCM_16BIT = AV_SAMPLE_FMT_S16;
// Output format corresponding to AudioFormat.ENCODING_PCM_FLOAT.
static const AVSampleFormat OUTPUT_FORMAT_PCM_FLOAT = AV_SAMPLE_FMT_FLT;
// LINT.IfChange
static const int AUDIO_DECODER_ERROR_INVALID_DATA = -1;
static const int AUDIO_DECODER_ERROR_OTHER = -2;
// LINT.ThenChange(../java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioDecoder.java)
/**
* Returns the AVCodec with the specified name, or NULL if it is not available.

2
extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
View file

@ -51,7 +51,6 @@ public final class FlacExtractor implements Extractor {
/** Factory that returns one extractor which is a {@link FlacExtractor}. */
public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new FlacExtractor()};
// LINT.IfChange
/*
* Flags in the two FLAC extractors should be kept in sync. If we ever change this then
* DefaultExtractorsFactory will need modifying, because it currently assumes this is the case.
@ -73,7 +72,6 @@ public final class FlacExtractor implements Extractor {
*/
public static final int FLAG_DISABLE_ID3_METADATA =
com.google.android.exoplayer2.extractor.flac.FlacExtractor.FLAG_DISABLE_ID3_METADATA;
// LINT.ThenChange(../../../../../../../../../../extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java)
private final ParsableByteArray outputBuffer;
private final boolean id3MetadataDisabled;

4
extensions/vp9/src/main/jni/vpx_jni.cc
View file

@ -534,19 +534,15 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
return 1;
}
// LINT.IfChange
const int kOutputModeYuv = 0;
const int kOutputModeSurfaceYuv = 1;
// LINT.ThenChange(../../../../../library/common/src/main/java/com/google/android/exoplayer2/C.java)
int outputMode = env->GetIntField(jOutputBuffer, outputModeField);
if (outputMode == kOutputModeYuv) {
// LINT.IfChange
const int kColorspaceUnknown = 0;
const int kColorspaceBT601 = 1;
const int kColorspaceBT709 = 2;
const int kColorspaceBT2020 = 3;
// LINT.ThenChange(../../../../../library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java)
int colorspace = kColorspaceUnknown;
switch (img->cs) {

5
library/common/src/main/java/com/google/android/exoplayer2/C.java
View file

@ -535,7 +535,6 @@ public final class C {
/** Indicates that a buffer should be decoded but not rendered. */
public static final int BUFFER_FLAG_DECODE_ONLY = 1 << 31; // 0x80000000
// LINT.IfChange
/**
* Video decoder output modes. Possible modes are {@link #VIDEO_OUTPUT_MODE_NONE}, {@link
* #VIDEO_OUTPUT_MODE_YUV} and {@link #VIDEO_OUTPUT_MODE_SURFACE_YUV}.
@ -550,10 +549,6 @@ public final class C {
public static final int VIDEO_OUTPUT_MODE_YUV = 0;
/** Video decoder output mode that renders 4:2:0 YUV planes directly to a surface. */
public static final int VIDEO_OUTPUT_MODE_SURFACE_YUV = 1;
// LINT.ThenChange(
// ../../../../../../../../decoder_av1/src/main/jni/gav1_jni.cc,
// ../../../../../../../../decoder_vp9/src/main/jni/vpx_jni.cc
// )
/**
* Video scaling modes for {@link MediaCodec}-based renderers. One of {@link

2
library/common/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
View file

@ -24,7 +24,6 @@ import java.lang.annotation.RetentionPolicy;
/** Util class for repeat mode handling. */
public final class RepeatModeUtil {
// LINT.IfChange
/**
* Set of repeat toggle modes. Can be combined using bit-wise operations. Possible flag values are
* {@link #REPEAT_TOGGLE_MODE_NONE}, {@link #REPEAT_TOGGLE_MODE_ONE} and {@link
@ -46,7 +45,6 @@ public final class RepeatModeUtil {
public static final int REPEAT_TOGGLE_MODE_ONE = 1;
/** "Repeat All" button enabled. */
public static final int REPEAT_TOGGLE_MODE_ALL = 1 << 1; // 2
// LINT.ThenChange(../../../../../../../../../ui/src/main/res/values/attrs.xml)
private RepeatModeUtil() {
// Prevent instantiation.

12
library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
View file

@ -390,7 +390,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
try {
// Full class names used for constructor args so the LINT rule triggers if any of them move.
// LINT.IfChange
Class<?> clazz = Class.forName("com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer");
Constructor<?> constructor =
clazz.getConstructor(
@ -398,7 +397,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
android.os.Handler.class,
com.google.android.exoplayer2.video.VideoRendererEventListener.class,
int.class);
// LINT.ThenChange(../../../../../../../proguard-rules.txt)
Renderer renderer =
(Renderer)
constructor.newInstance(
@ -417,7 +415,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
try {
// Full class names used for constructor args so the LINT rule triggers if any of them move.
// LINT.IfChange
Class<?> clazz = Class.forName("com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer");
Constructor<?> constructor =
clazz.getConstructor(
@ -425,7 +422,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
android.os.Handler.class,
com.google.android.exoplayer2.video.VideoRendererEventListener.class,
int.class);
// LINT.ThenChange(../../../../../../../proguard-rules.txt)
Renderer renderer =
(Renderer)
constructor.newInstance(
@ -444,7 +440,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
try {
// Full class names used for constructor args so the LINT rule triggers if any of them move.
// LINT.IfChange
Class<?> clazz =
Class.forName("com.google.android.exoplayer2.ext.ffmpeg.FfmpegVideoRenderer");
Constructor<?> constructor =
@ -453,7 +448,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
android.os.Handler.class,
com.google.android.exoplayer2.video.VideoRendererEventListener.class,
int.class);
// LINT.ThenChange(../../../../../../../proguard-rules.txt)
Renderer renderer =
(Renderer)
constructor.newInstance(
@ -519,14 +513,12 @@ public class DefaultRenderersFactory implements RenderersFactory {
try {
// Full class names used for constructor args so the LINT rule triggers if any of them move.
// LINT.IfChange
Class<?> clazz = Class.forName("com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer");
Constructor<?> constructor =
clazz.getConstructor(
android.os.Handler.class,
com.google.android.exoplayer2.audio.AudioRendererEventListener.class,
com.google.android.exoplayer2.audio.AudioSink.class);
// LINT.ThenChange(../../../../../../../proguard-rules.txt)
Renderer renderer =
(Renderer) constructor.newInstance(eventHandler, eventListener, audioSink);
out.add(extensionRendererIndex++, renderer);
@ -540,14 +532,12 @@ public class DefaultRenderersFactory implements RenderersFactory {
try {
// Full class names used for constructor args so the LINT rule triggers if any of them move.
// LINT.IfChange
Class<?> clazz = Class.forName("com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer");
Constructor<?> constructor =
clazz.getConstructor(
android.os.Handler.class,
com.google.android.exoplayer2.audio.AudioRendererEventListener.class,
com.google.android.exoplayer2.audio.AudioSink.class);
// LINT.ThenChange(../../../../../../../proguard-rules.txt)
Renderer renderer =
(Renderer) constructor.newInstance(eventHandler, eventListener, audioSink);
out.add(extensionRendererIndex++, renderer);
@ -561,7 +551,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
try {
// Full class names used for constructor args so the LINT rule triggers if any of them move.
// LINT.IfChange
Class<?> clazz =
Class.forName("com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer");
Constructor<?> constructor =
@ -569,7 +558,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
android.os.Handler.class,
com.google.android.exoplayer2.audio.AudioRendererEventListener.class,
com.google.android.exoplayer2.audio.AudioSink.class);
// LINT.ThenChange(../../../../../../../proguard-rules.txt)
Renderer renderer =
(Renderer) constructor.newInstance(eventHandler, eventListener, audioSink);
out.add(extensionRendererIndex++, renderer);

2
library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
View file

@ -108,7 +108,6 @@ public class DefaultDownloaderFactory implements DownloaderFactory {
}
}
// LINT.IfChange
private static SparseArray<Constructor<? extends Downloader>> createDownloaderConstructors() {
SparseArray<Constructor<? extends Downloader>> array = new SparseArray<>();
try {
@ -150,5 +149,4 @@ public class DefaultDownloaderFactory implements DownloaderFactory {
throw new IllegalStateException("Downloader constructor missing", e);
}
}
// LINT.ThenChange(../../../../../../../../proguard-rules.txt)
}

2
library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
View file

@ -436,7 +436,6 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
private static SparseArray<MediaSourceFactory> loadDelegates(
DataSource.Factory dataSourceFactory, ExtractorsFactory extractorsFactory) {
SparseArray<MediaSourceFactory> factories = new SparseArray<>();
// LINT.IfChange
try {
Class<? extends MediaSourceFactory> factoryClazz =
Class.forName("com.google.android.exoplayer2.source.dash.DashMediaSource$Factory")
@ -476,7 +475,6 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
} catch (Exception e) {
// Expected if the app was built without the RTSP module.
}
// LINT.ThenChange(../../../../../../../../proguard-rules.txt)
factories.put(
C.TYPE_OTHER, new ProgressiveMediaSource.Factory(dataSourceFactory, extractorsFactory));
return factories;

2
library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
View file

@ -263,10 +263,8 @@ public final class DefaultDataSource implements DataSource {
private DataSource getRtmpDataSource() {
if (rtmpDataSource == null) {
try {
// LINT.IfChange
Class<?> clazz = Class.forName("com.google.android.exoplayer2.ext.rtmp.RtmpDataSource");
rtmpDataSource = (DataSource) clazz.getConstructor().newInstance();
// LINT.ThenChange(../../../../../../../../proguard-rules.txt)
addListenersToDataSource(rtmpDataSource);
} catch (ClassNotFoundException e) {
// Expected if the app was built without the RTMP extension.

5
library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java
View file

@ -24,15 +24,10 @@ import java.nio.ByteBuffer;
/** Video decoder output buffer containing video frame data. */
public class VideoDecoderOutputBuffer extends OutputBuffer {
// LINT.IfChange
public static final int COLORSPACE_UNKNOWN = 0;
public static final int COLORSPACE_BT601 = 1;
public static final int COLORSPACE_BT709 = 2;
public static final int COLORSPACE_BT2020 = 3;
// LINT.ThenChange(
// ../../../../../../../../../../../../media/libraries/decoder_av1/src/main/jni/gav1_jni.cc,
// ../../../../../../../../../../../../media/libraries/decoder_vp9/src/main/jni/vpx_jni.cc
// )
/** Decoder private data. Used from native code. */
public int decoderPrivate;

2
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
View file

@ -103,7 +103,6 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
static {
@Nullable Constructor<? extends Extractor> flacExtensionExtractorConstructor = null;
try {
// LINT.IfChange
@SuppressWarnings("nullness:argument.type.incompatible")
boolean isFlacNativeLibraryAvailable =
Boolean.TRUE.equals(
@ -116,7 +115,6 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
.asSubclass(Extractor.class)
.getConstructor(int.class);
}
// LINT.ThenChange(../../../../../../../../proguard-rules.txt)
} catch (ClassNotFoundException e) {
// Expected if the app was built without the FLAC extension.
} catch (Exception e) {

2
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
View file

@ -54,7 +54,6 @@ public final class FlacExtractor implements Extractor {
/** Factory for {@link FlacExtractor} instances. */
public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new FlacExtractor()};
// LINT.IfChange
/*
* Flags in the two FLAC extractors should be kept in sync. If we ever change this then
* DefaultExtractorsFactory will need modifying, because it currently assumes this is the case.
@ -75,7 +74,6 @@ public final class FlacExtractor implements Extractor {
* required.
*/
public static final int FLAG_DISABLE_ID3_METADATA = 1;
// LINT.ThenChange(../../../../../../../../../../decoder_flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java)
/** Parser state. */
@Documented

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
View file

@ -44,7 +44,6 @@ public final class AspectRatioFrameLayout extends FrameLayout {
float targetAspectRatio, float naturalAspectRatio, boolean aspectRatioMismatch);
}
// LINT.IfChange
/**
* Resize modes for {@link AspectRatioFrameLayout}. One of {@link #RESIZE_MODE_FIT}, {@link
* #RESIZE_MODE_FIXED_WIDTH}, {@link #RESIZE_MODE_FIXED_HEIGHT}, {@link #RESIZE_MODE_FILL} or
@ -81,7 +80,6 @@ public final class AspectRatioFrameLayout extends FrameLayout {
* Either the width or height is increased to obtain the desired aspect ratio.
*/
public static final int RESIZE_MODE_ZOOM = 4;
// LINT.ThenChange(../../../../../../res/values/attrs.xml)
/**
* The {@link FrameLayout} will not resize itself if the fractional difference between its natural

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
View file

@ -152,12 +152,10 @@ public class DefaultTimeBar extends View implements TimeBar {
/** Default color for played ad markers. */
public static final int DEFAULT_PLAYED_AD_MARKER_COLOR = 0x33FFFF00;
// LINT.IfChange
/** Vertical gravity for progress bar to be located at the center in the view. */
public static final int BAR_GRAVITY_CENTER = 0;
/** Vertical gravity for progress bar to be located at the bottom in the view. */
public static final int BAR_GRAVITY_BOTTOM = 1;
// LINT.ThenChange(../../../../../../../../../ui/src/main/res/values/attrs.xml)
/** The threshold in dps above the bar at which touch events trigger fine scrub mode. */
private static final int FINE_SCRUB_Y_THRESHOLD_DP = -50;

4
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
View file

@ -260,7 +260,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
*/
public class PlayerView extends FrameLayout implements AdViewProvider {
// LINT.IfChange
/**
* Determines when the buffering view is shown. One of {@link #SHOW_BUFFERING_NEVER}, {@link
* #SHOW_BUFFERING_WHEN_PLAYING} or {@link #SHOW_BUFFERING_ALWAYS}.
@ -281,15 +280,12 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
* buffering} state.
*/
public static final int SHOW_BUFFERING_ALWAYS = 2;
// LINT.ThenChange(../../../../../../res/values/attrs.xml)
// LINT.IfChange
private static final int SURFACE_TYPE_NONE = 0;
private static final int SURFACE_TYPE_SURFACE_VIEW = 1;
private static final int SURFACE_TYPE_TEXTURE_VIEW = 2;
private static final int SURFACE_TYPE_SPHERICAL_GL_SURFACE_VIEW = 3;
private static final int SURFACE_TYPE_VIDEO_DECODER_GL_SURFACE_VIEW = 4;
// LINT.ThenChange(../../../../../../res/values/attrs.xml)
private final ComponentListener componentListener;
@Nullable private final AspectRatioFrameLayout contentFrame;

4
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
View file

@ -261,7 +261,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
*/
public class StyledPlayerView extends FrameLayout implements AdViewProvider {
// LINT.IfChange
/**
* Determines when the buffering view is shown. One of {@link #SHOW_BUFFERING_NEVER}, {@link
* #SHOW_BUFFERING_WHEN_PLAYING} or {@link #SHOW_BUFFERING_ALWAYS}.
@ -282,15 +281,12 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
* buffering} state.
*/
public static final int SHOW_BUFFERING_ALWAYS = 2;
// LINT.ThenChange(../../../../../../res/values/attrs.xml)
// LINT.IfChange
private static final int SURFACE_TYPE_NONE = 0;
private static final int SURFACE_TYPE_SURFACE_VIEW = 1;
private static final int SURFACE_TYPE_TEXTURE_VIEW = 2;
private static final int SURFACE_TYPE_SPHERICAL_GL_SURFACE_VIEW = 3;
private static final int SURFACE_TYPE_VIDEO_DECODER_GL_SURFACE_VIEW = 4;
// LINT.ThenChange(../../../../../../res/values/attrs.xml)
private final ComponentListener componentListener;
@Nullable private final AspectRatioFrameLayout contentFrame;

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
View file

@ -262,7 +262,6 @@ public final class TrackSelectionDialogBuilder {
try {
// This method uses reflection to avoid a dependency on AndroidX appcompat that adds 800KB to
// the APK size even with shrinking. See https://issuetracker.google.com/161514204.
// LINT.IfChange
Class<?> builderClazz = Class.forName("androidx.appcompat.app.AlertDialog$Builder");
Constructor<?> builderConstructor = builderClazz.getConstructor(Context.class, int.class);
Object builder = builderConstructor.newInstance(context, themeResId);
@ -283,7 +282,6 @@ public final class TrackSelectionDialogBuilder {
.getMethod("setNegativeButton", int.class, DialogInterface.OnClickListener.class)
.invoke(builder, android.R.string.cancel, null);
return (Dialog) builderClazz.getMethod("create").invoke(builder);
// LINT.ThenChange(../../../../../../../../proguard-rules.txt)
} catch (ClassNotFoundException e) {
// Expected if the AndroidX compat library is not available.
return null;