diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java index 0af7adfc2a..f0c1488262 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java @@ -78,7 +78,7 @@ public class FlacPlaybackTest extends InstrumentationTestCase { uri, new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"), null, - new MatroskaExtractor.Factory(), + MatroskaExtractor.FACTORY, null, null); player.setMediaSource(mediaSource); diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java index 0f93334e87..07f7e991af 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java @@ -40,14 +40,14 @@ public final class FlacExtractor implements Extractor { /** * Factory that returns one extractor which is a {@link FlacExtractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new FlacExtractor()}; } - } + }; /** * FLAC signature: first 4 is the signature word, second 4 is the sizeof STREAMINFO. 0x22 is the diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java index 6e4082cfb0..e34d3d0a9e 100644 --- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java +++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java @@ -78,7 +78,7 @@ public class OpusPlaybackTest extends InstrumentationTestCase { uri, new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"), null, - new MatroskaExtractor.Factory(), + MatroskaExtractor.FACTORY, null, null); player.setMediaSource(mediaSource); diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java index 45efed2a79..5a89733ec1 100644 --- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java +++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java @@ -94,7 +94,7 @@ public class VpxPlaybackTest extends InstrumentationTestCase { uri, new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"), null, - new MatroskaExtractor.Factory(), + MatroskaExtractor.FACTORY, null, null); player.sendMessages(new ExoPlayer.ExoPlayerMessage(videoRenderer, diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java index c34b346cce..50eb7d7e93 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java @@ -34,14 +34,14 @@ public final class FlvExtractor implements Extractor, SeekMap { /** * Factory that returns one extractor which is a {@link FlvExtractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new FlvExtractor()}; } - } + }; // Header sizes. private static final int FLV_HEADER_SIZE = 9; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java index f620069b6f..d1091c300d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java @@ -55,14 +55,14 @@ public final class MatroskaExtractor implements Extractor { /** * Factory that returns one extractor which is a {@link MatroskaExtractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new MatroskaExtractor()}; } - } + }; private static final int BLOCK_STATE_START = 0; private static final int BLOCK_STATE_HEADER = 1; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java index 930764c42a..d08ec7c93f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java @@ -41,14 +41,14 @@ public final class Mp3Extractor implements Extractor { /** * Factory that returns one extractor which is an {@link Mp3Extractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new Mp3Extractor()}; } - } + }; /** * The maximum number of bytes to search when synchronizing, before giving up. diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java index 0a4c0d2649..713b5987e6 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java @@ -54,14 +54,14 @@ public final class FragmentedMp4Extractor implements Extractor { /** * Factory that returns one extractor which is a {@link FragmentedMp4Extractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new FragmentedMp4Extractor()}; } - } + }; private static final String TAG = "FragmentedMp4Extractor"; private static final int SAMPLE_GROUP_TYPE_seig = Util.getIntegerCodeForString("seig"); diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java index 5635e76399..da93130c95 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java @@ -45,14 +45,14 @@ public final class Mp4Extractor implements Extractor, SeekMap { /** * Factory that returns one extractor which is an {@link Mp4Extractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new Mp4Extractor()}; } - } + }; // Parser states. private static final int STATE_AFTER_SEEK = 0; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java index 8588595fd6..a408baa131 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java @@ -34,14 +34,14 @@ public class OggExtractor implements Extractor { /** * Factory that returns one extractor which is an {@link OggExtractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new OggExtractor()}; } - } + }; private static final int MAX_VERIFICATION_BYTES = 8; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java index f9bffe5b88..2a95aadc2e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java @@ -37,14 +37,14 @@ public final class AdtsExtractor implements Extractor { /** * Factory that returns one extractor which is an {@link AdtsExtractor}. */ - public static final class Factory implements ExtractorsFactory { + 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 ID3_TAG = Util.getIntegerCodeForString("ID3"); diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java index 8c9e2e9763..7d80185234 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java @@ -37,14 +37,14 @@ public final class PsExtractor implements Extractor { /** * Factory that returns one extractor which is a {@link PsExtractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new PsExtractor()}; } - } + }; private static final int PACK_START_CODE = 0x000001BA; private static final int SYSTEM_HEADER_START_CODE = 0x000001BB; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java index d192ca59fb..cb334af4e7 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java @@ -42,14 +42,14 @@ public final class TsExtractor implements Extractor { /** * Factory that returns one extractor which is a {@link TsExtractor}. */ - public static final class Factory implements ExtractorsFactory { + public static final ExtractorsFactory FACTORY = new ExtractorsFactory() { @Override public Extractor[] createExtractors() { return new Extractor[] {new TsExtractor()}; } - } + }; public static final int WORKAROUND_ALLOW_NON_IDR_KEYFRAMES = 1; public static final int WORKAROUND_IGNORE_AAC_STREAM = 2; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java index 5d3db10c87..214c18cfaf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java @@ -35,14 +35,14 @@ public final class WavExtractor implements Extractor, SeekMap { /** * Factory that returns one extractor which is a {@link WavExtractor}. */ - public static final class Factory implements ExtractorsFactory { + 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. */ private static final int MAX_INPUT_SIZE = 32 * 1024;