Skip to content

SDK / exoplayer

Go to a project
Commit 7551d980 by olly Committed by Oliver Woodman
Options

Cleanup: Use lambdas for extractor factories 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=205407693
parent 8be95042
Inline Side-by-side
Showing with 25 additions and 132 deletions
extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
...@@ -46,17 +46,8 @@ import java.util.Arrays; ...@@ -46,17 +46,8 @@ import java.util.Arrays;
*/ */
public final class FlacExtractor implements Extractor { public final class FlacExtractor implements Extractor {
/** /** Factory that returns one extractor which is a {@link FlacExtractor}. */
* Factory that returns one extractor which is a {@link FlacExtractor}. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new FlacExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new FlacExtractor()};
}
};
/** Flags controlling the behavior of the extractor. */ /** Flags controlling the behavior of the extractor. */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
...@@ -34,17 +34,8 @@ import java.lang.annotation.RetentionPolicy; ...@@ -34,17 +34,8 @@ import java.lang.annotation.RetentionPolicy;
*/ */
public final class FlvExtractor implements Extractor { public final class FlvExtractor implements Extractor {
/** /** Factory for {@link FlvExtractor} instances. */
* Factory for {@link FlvExtractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new FlvExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new FlvExtractor()};
}
};
/** /**
* Extractor states. * Extractor states.
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
...@@ -61,17 +61,8 @@ import java.util.UUID; ...@@ -61,17 +61,8 @@ import java.util.UUID;
*/ */
public final class MatroskaExtractor implements Extractor { public final class MatroskaExtractor implements Extractor {
/** /** Factory for {@link MatroskaExtractor} instances. */
* Factory for {@link MatroskaExtractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new MatroskaExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new MatroskaExtractor()};
}
};
/** /**
* Flags controlling the behavior of the extractor. * Flags controlling the behavior of the extractor.
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
...@@ -43,17 +43,8 @@ import java.lang.annotation.RetentionPolicy; ...@@ -43,17 +43,8 @@ import java.lang.annotation.RetentionPolicy;
*/ */
public final class Mp3Extractor implements Extractor { public final class Mp3Extractor implements Extractor {
/** /** Factory for {@link Mp3Extractor} instances. */
* Factory for {@link Mp3Extractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new Mp3Extractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new Mp3Extractor()};
}
};
/** /**
* Flags controlling the behavior of the extractor. * Flags controlling the behavior of the extractor.
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
...@@ -57,17 +57,9 @@ import java.util.UUID; ...@@ -57,17 +57,9 @@ import java.util.UUID;
*/ */
public final class FragmentedMp4Extractor implements Extractor { public final class FragmentedMp4Extractor implements Extractor {
/** /** Factory for {@link FragmentedMp4Extractor} instances. */
* Factory for {@link FragmentedMp4Extractor} instances. public static final ExtractorsFactory FACTORY =
*/ () -> new Extractor[] {new FragmentedMp4Extractor()};
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new FragmentedMp4Extractor()};
}
};
/** /**
* Flags controlling the behavior of the extractor. * Flags controlling the behavior of the extractor.
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
...@@ -46,17 +46,8 @@ import java.util.List; ...@@ -46,17 +46,8 @@ import java.util.List;
*/ */
public final class Mp4Extractor implements Extractor, SeekMap { public final class Mp4Extractor implements Extractor, SeekMap {
/** /** Factory for {@link Mp4Extractor} instances. */
* Factory for {@link Mp4Extractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new Mp4Extractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new Mp4Extractor()};
}
};
/** /**
* Flags controlling the behavior of the extractor. * Flags controlling the behavior of the extractor.
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java
...@@ -31,17 +31,8 @@ import java.io.IOException; ...@@ -31,17 +31,8 @@ import java.io.IOException;
*/ */
public class OggExtractor implements Extractor { public class OggExtractor implements Extractor {
/** /** Factory for {@link OggExtractor} instances. */
* Factory for {@link OggExtractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new OggExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new OggExtractor()};
}
};
private static final int MAX_VERIFICATION_BYTES = 8; private static final int MAX_VERIFICATION_BYTES = 8;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
...@@ -33,17 +33,8 @@ import java.io.IOException; ...@@ -33,17 +33,8 @@ import java.io.IOException;
*/ */
public final class Ac3Extractor implements Extractor { public final class Ac3Extractor implements Extractor {
/** /** Factory for {@link Ac3Extractor} instances. */
* Factory for {@link Ac3Extractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new Ac3Extractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new Ac3Extractor()};
}
};
/** /**
* The maximum number of bytes to search when sniffing, excluding ID3 information, before giving * The maximum number of bytes to search when sniffing, excluding ID3 information, before giving
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
...@@ -33,17 +33,8 @@ import java.io.IOException; ...@@ -33,17 +33,8 @@ import java.io.IOException;
*/ */
public final class AdtsExtractor implements Extractor { public final class AdtsExtractor implements Extractor {
/** /** Factory for {@link AdtsExtractor} instances. */
* Factory for {@link AdtsExtractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new AdtsExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new AdtsExtractor()};
}
};
private static final int MAX_PACKET_SIZE = 200; private static final int MAX_PACKET_SIZE = 200;
private static final int ID3_TAG = Util.getIntegerCodeForString("ID3"); private static final int ID3_TAG = Util.getIntegerCodeForString("ID3");
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java
...@@ -35,17 +35,8 @@ import java.io.IOException; ...@@ -35,17 +35,8 @@ import java.io.IOException;
*/ */
public final class PsExtractor implements Extractor { public final class PsExtractor implements Extractor {
/** /** Factory for {@link PsExtractor} instances. */
* Factory for {@link PsExtractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new PsExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new PsExtractor()};
}
};
/* package */ static final int PACK_START_CODE = 0x000001BA; /* package */ static final int PACK_START_CODE = 0x000001BA;
private static final int SYSTEM_HEADER_START_CODE = 0x000001BB; private static final int SYSTEM_HEADER_START_CODE = 0x000001BB;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
...@@ -50,17 +50,8 @@ import java.util.List; ...@@ -50,17 +50,8 @@ import java.util.List;
*/ */
public final class TsExtractor implements Extractor { public final class TsExtractor implements Extractor {
/** /** Factory for {@link TsExtractor} instances. */
* Factory for {@link TsExtractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new TsExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new TsExtractor()};
}
};
/** /**
* Modes for the extractor. * Modes for the extractor.
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
...@@ -32,17 +32,8 @@ import java.io.IOException; ...@@ -32,17 +32,8 @@ import java.io.IOException;
*/ */
public final class WavExtractor implements Extractor { public final class WavExtractor implements Extractor {
/** /** Factory for {@link WavExtractor} instances. */
* Factory for {@link WavExtractor} instances. public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new WavExtractor()};
*/
public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override
public Extractor[] createExtractors() {
return new Extractor[] {new WavExtractor()};
}
};
/** Arbitrary maximum input size of 32KB, which is ~170ms of 16-bit stereo PCM audio at 48KHz. */ /** Arbitrary maximum input size of 32KB, which is ~170ms of 16-bit stereo PCM audio at 48KHz. */
private static final int MAX_INPUT_SIZE = 32 * 1024; private static final int MAX_INPUT_SIZE = 32 * 1024;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment