Convert extractor factory classes to static final objects

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=127415273
This commit is contained in:
olly 2016-07-14 03:41:43 -07:00 committed by Oliver Woodman
parent f758082d40
commit 2d8b51a709
14 changed files with 25 additions and 25 deletions

View File

@ -78,7 +78,7 @@ public class FlacPlaybackTest extends InstrumentationTestCase {
uri, uri,
new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"), new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"),
null, null,
new MatroskaExtractor.Factory(), MatroskaExtractor.FACTORY,
null, null,
null); null);
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);

View File

@ -40,14 +40,14 @@ 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 class Factory implements ExtractorsFactory { public static final ExtractorsFactory FACTORY = new ExtractorsFactory() {
@Override @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new FlacExtractor()}; return new Extractor[] {new FlacExtractor()};
} }
} };
/** /**
* FLAC signature: first 4 is the signature word, second 4 is the sizeof STREAMINFO. 0x22 is the * FLAC signature: first 4 is the signature word, second 4 is the sizeof STREAMINFO. 0x22 is the

View File

@ -78,7 +78,7 @@ public class OpusPlaybackTest extends InstrumentationTestCase {
uri, uri,
new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"), new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"),
null, null,
new MatroskaExtractor.Factory(), MatroskaExtractor.FACTORY,
null, null,
null); null);
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);

View File

@ -94,7 +94,7 @@ public class VpxPlaybackTest extends InstrumentationTestCase {
uri, uri,
new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"), new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"),
null, null,
new MatroskaExtractor.Factory(), MatroskaExtractor.FACTORY,
null, null,
null); null);
player.sendMessages(new ExoPlayer.ExoPlayerMessage(videoRenderer, player.sendMessages(new ExoPlayer.ExoPlayerMessage(videoRenderer,

View File

@ -34,14 +34,14 @@ public final class FlvExtractor implements Extractor, SeekMap {
/** /**
* Factory that returns one extractor which is a {@link FlvExtractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new FlvExtractor()}; return new Extractor[] {new FlvExtractor()};
} }
} };
// Header sizes. // Header sizes.
private static final int FLV_HEADER_SIZE = 9; private static final int FLV_HEADER_SIZE = 9;

View File

@ -55,14 +55,14 @@ public final class MatroskaExtractor implements Extractor {
/** /**
* Factory that returns one extractor which is a {@link MatroskaExtractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new MatroskaExtractor()}; return new Extractor[] {new MatroskaExtractor()};
} }
} };
private static final int BLOCK_STATE_START = 0; private static final int BLOCK_STATE_START = 0;
private static final int BLOCK_STATE_HEADER = 1; private static final int BLOCK_STATE_HEADER = 1;

View File

@ -41,14 +41,14 @@ public final class Mp3Extractor implements Extractor {
/** /**
* Factory that returns one extractor which is an {@link Mp3Extractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new Mp3Extractor()}; return new Extractor[] {new Mp3Extractor()};
} }
} };
/** /**
* The maximum number of bytes to search when synchronizing, before giving up. * The maximum number of bytes to search when synchronizing, before giving up.

View File

@ -54,14 +54,14 @@ public final class FragmentedMp4Extractor implements Extractor {
/** /**
* Factory that returns one extractor which is a {@link FragmentedMp4Extractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new FragmentedMp4Extractor()}; return new Extractor[] {new FragmentedMp4Extractor()};
} }
} };
private static final String TAG = "FragmentedMp4Extractor"; private static final String TAG = "FragmentedMp4Extractor";
private static final int SAMPLE_GROUP_TYPE_seig = Util.getIntegerCodeForString("seig"); private static final int SAMPLE_GROUP_TYPE_seig = Util.getIntegerCodeForString("seig");

View File

@ -45,14 +45,14 @@ public final class Mp4Extractor implements Extractor, SeekMap {
/** /**
* Factory that returns one extractor which is an {@link Mp4Extractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new Mp4Extractor()}; return new Extractor[] {new Mp4Extractor()};
} }
} };
// Parser states. // Parser states.
private static final int STATE_AFTER_SEEK = 0; private static final int STATE_AFTER_SEEK = 0;

View File

@ -34,14 +34,14 @@ public class OggExtractor implements Extractor {
/** /**
* Factory that returns one extractor which is an {@link OggExtractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new OggExtractor()}; return new Extractor[] {new OggExtractor()};
} }
} };
private static final int MAX_VERIFICATION_BYTES = 8; private static final int MAX_VERIFICATION_BYTES = 8;

View File

@ -37,14 +37,14 @@ public final class AdtsExtractor implements Extractor {
/** /**
* Factory that returns one extractor which is an {@link AdtsExtractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new AdtsExtractor()}; 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");

View File

@ -37,14 +37,14 @@ public final class PsExtractor implements Extractor {
/** /**
* Factory that returns one extractor which is a {@link PsExtractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new PsExtractor()}; return new Extractor[] {new PsExtractor()};
} }
} };
private static final int PACK_START_CODE = 0x000001BA; private 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;

View File

@ -42,14 +42,14 @@ public final class TsExtractor implements Extractor {
/** /**
* Factory that returns one extractor which is a {@link TsExtractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new TsExtractor()}; return new Extractor[] {new TsExtractor()};
} }
} };
public static final int WORKAROUND_ALLOW_NON_IDR_KEYFRAMES = 1; public static final int WORKAROUND_ALLOW_NON_IDR_KEYFRAMES = 1;
public static final int WORKAROUND_IGNORE_AAC_STREAM = 2; public static final int WORKAROUND_IGNORE_AAC_STREAM = 2;

View File

@ -35,14 +35,14 @@ public final class WavExtractor implements Extractor, SeekMap {
/** /**
* Factory that returns one extractor which is a {@link WavExtractor}. * 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 @Override
public Extractor[] createExtractors() { public Extractor[] createExtractors() {
return new Extractor[] {new WavExtractor()}; 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;