Skip to content

SDK / exoplayer

Go to a project
Commit 21be2843 by olly Committed by Toni
Options

Replace runtime lookups of string integer codes 

Make these values compile-time constants, which can be inlined.

PiperOrigin-RevId: 249327464
parent 8669d6dc
Expand all
Inline Side-by-side
Showing with 102 additions and 115 deletions
library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
...@@ -23,13 +23,13 @@ import com.google.android.exoplayer2.util.Util; ...@@ -23,13 +23,13 @@ import com.google.android.exoplayer2.util.Util;
public final class WavUtil { public final class WavUtil {
/** Four character code for "RIFF". */ /** Four character code for "RIFF". */
public static final int RIFF_FOURCC = Util.getIntegerCodeForString("RIFF"); public static final int RIFF_FOURCC = 0x52494646;
/** Four character code for "WAVE". */ /** Four character code for "WAVE". */
public static final int WAVE_FOURCC = Util.getIntegerCodeForString("WAVE"); public static final int WAVE_FOURCC = 0x57415645;
/** Four character code for "fmt ". */ /** Four character code for "fmt ". */
public static final int FMT_FOURCC = Util.getIntegerCodeForString("fmt "); public static final int FMT_FOURCC = 0x666d7420;
/** Four character code for "data". */ /** Four character code for "data". */
public static final int DATA_FOURCC = Util.getIntegerCodeForString("data"); public static final int DATA_FOURCC = 0x64617461;
/** WAVE type value for integer PCM audio data. */ /** WAVE type value for integer PCM audio data. */
private static final int TYPE_PCM = 0x0001; private static final int TYPE_PCM = 0x0001;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
...@@ -24,7 +24,6 @@ import com.google.android.exoplayer2.extractor.ExtractorsFactory; ...@@ -24,7 +24,6 @@ import com.google.android.exoplayer2.extractor.ExtractorsFactory;
import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -64,7 +63,7 @@ public final class FlvExtractor implements Extractor { ...@@ -64,7 +63,7 @@ public final class FlvExtractor implements Extractor {
private static final int TAG_TYPE_SCRIPT_DATA = 18; private static final int TAG_TYPE_SCRIPT_DATA = 18;
// FLV container identifier. // FLV container identifier.
private static final int FLV_TAG = Util.getIntegerCodeForString("FLV"); private static final int FLV_TAG = 0x00464c56;
private final ParsableByteArray scratch; private final ParsableByteArray scratch;
private final ParsableByteArray headerBuffer; private final ParsableByteArray headerBuffer;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
...@@ -35,7 +35,6 @@ import com.google.android.exoplayer2.metadata.id3.Id3Decoder; ...@@ -35,7 +35,6 @@ import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
import com.google.android.exoplayer2.metadata.id3.Id3Decoder.FramePredicate; import com.google.android.exoplayer2.metadata.id3.Id3Decoder.FramePredicate;
import com.google.android.exoplayer2.metadata.id3.MlltFrame; import com.google.android.exoplayer2.metadata.id3.MlltFrame;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
...@@ -95,9 +94,9 @@ public final class Mp3Extractor implements Extractor { ...@@ -95,9 +94,9 @@ public final class Mp3Extractor implements Extractor {
*/ */
private static final int MPEG_AUDIO_HEADER_MASK = 0xFFFE0C00; private static final int MPEG_AUDIO_HEADER_MASK = 0xFFFE0C00;
private static final int SEEK_HEADER_XING = Util.getIntegerCodeForString("Xing"); private static final int SEEK_HEADER_XING = 0x58696e67;
private static final int SEEK_HEADER_INFO = Util.getIntegerCodeForString("Info"); private static final int SEEK_HEADER_INFO = 0x496e666f;
private static final int SEEK_HEADER_VBRI = Util.getIntegerCodeForString("VBRI"); private static final int SEEK_HEADER_VBRI = 0x56425249;
private static final int SEEK_HEADER_UNSET = 0; private static final int SEEK_HEADER_UNSET = 0;
@Flags private final int flags; @Flags private final int flags;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
...@@ -48,28 +48,28 @@ import java.util.List; ...@@ -48,28 +48,28 @@ import java.util.List;
private static final String TAG = "AtomParsers"; private static final String TAG = "AtomParsers";
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_vide = Util.getIntegerCodeForString("vide"); private static final int TYPE_vide = 0x76696465;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_soun = Util.getIntegerCodeForString("soun"); private static final int TYPE_soun = 0x736f756e;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_text = Util.getIntegerCodeForString("text"); private static final int TYPE_text = 0x74657874;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_sbtl = Util.getIntegerCodeForString("sbtl"); private static final int TYPE_sbtl = 0x7362746c;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_subt = Util.getIntegerCodeForString("subt"); private static final int TYPE_subt = 0x73756274;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_clcp = Util.getIntegerCodeForString("clcp"); private static final int TYPE_clcp = 0x636c6370;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_meta = Util.getIntegerCodeForString("meta"); private static final int TYPE_meta = 0x6d657461;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_mdta = Util.getIntegerCodeForString("mdta"); private static final int TYPE_mdta = 0x6d647461;
/** /**
* The threshold number of samples to trim from the start/end of an audio track when applying an * The threshold number of samples to trim from the start/end of an audio track when applying an
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
...@@ -106,7 +106,7 @@ public class FragmentedMp4Extractor implements Extractor { ...@@ -106,7 +106,7 @@ public class FragmentedMp4Extractor implements Extractor {
private static final String TAG = "FragmentedMp4Extractor"; private static final String TAG = "FragmentedMp4Extractor";
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int SAMPLE_GROUP_TYPE_seig = Util.getIntegerCodeForString("seig"); private static final int SAMPLE_GROUP_TYPE_seig = 0x73656967;
private static final byte[] PIFF_SAMPLE_ENCRYPTION_BOX_EXTENDED_TYPE = private static final byte[] PIFF_SAMPLE_ENCRYPTION_BOX_EXTENDED_TYPE =
new byte[] {-94, 57, 79, 82, 90, -101, 79, 20, -94, 68, 108, 66, 124, 100, -115, -12}; new byte[] {-94, 57, 79, 82, 90, -101, 79, 20, -94, 68, 108, 66, 124, 100, -115, -12};
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.metadata.id3.InternalFrame; ...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.metadata.id3.InternalFrame;
import com.google.android.exoplayer2.metadata.id3.TextInformationFrame; import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
/** Utilities for handling metadata in MP4. */ /** Utilities for handling metadata in MP4. */
...@@ -36,41 +35,41 @@ import java.nio.ByteBuffer; ...@@ -36,41 +35,41 @@ import java.nio.ByteBuffer;
private static final String TAG = "MetadataUtil"; private static final String TAG = "MetadataUtil";
// Codes that start with the copyright character (omitted) and have equivalent ID3 frames. // Codes that start with the copyright character (omitted) and have equivalent ID3 frames.
private static final int SHORT_TYPE_NAME_1 = Util.getIntegerCodeForString("nam"); private static final int SHORT_TYPE_NAME_1 = 0x006e616d;
private static final int SHORT_TYPE_NAME_2 = Util.getIntegerCodeForString("trk"); private static final int SHORT_TYPE_NAME_2 = 0x0074726b;
private static final int SHORT_TYPE_COMMENT = Util.getIntegerCodeForString("cmt"); private static final int SHORT_TYPE_COMMENT = 0x00636d74;
private static final int SHORT_TYPE_YEAR = Util.getIntegerCodeForString("day"); private static final int SHORT_TYPE_YEAR = 0x00646179;
private static final int SHORT_TYPE_ARTIST = Util.getIntegerCodeForString("ART"); private static final int SHORT_TYPE_ARTIST = 0x00415254;
private static final int SHORT_TYPE_ENCODER = Util.getIntegerCodeForString("too"); private static final int SHORT_TYPE_ENCODER = 0x00746f6f;
private static final int SHORT_TYPE_ALBUM = Util.getIntegerCodeForString("alb"); private static final int SHORT_TYPE_ALBUM = 0x00616c62;
private static final int SHORT_TYPE_COMPOSER_1 = Util.getIntegerCodeForString("com"); private static final int SHORT_TYPE_COMPOSER_1 = 0x00636f6d;
private static final int SHORT_TYPE_COMPOSER_2 = Util.getIntegerCodeForString("wrt"); private static final int SHORT_TYPE_COMPOSER_2 = 0x00777274;
private static final int SHORT_TYPE_LYRICS = Util.getIntegerCodeForString("lyr"); private static final int SHORT_TYPE_LYRICS = 0x006c7972;
private static final int SHORT_TYPE_GENRE = Util.getIntegerCodeForString("gen"); private static final int SHORT_TYPE_GENRE = 0x0067656e;
// Codes that have equivalent ID3 frames. // Codes that have equivalent ID3 frames.
private static final int TYPE_COVER_ART = Util.getIntegerCodeForString("covr"); private static final int TYPE_COVER_ART = 0x636f7672;
private static final int TYPE_GENRE = Util.getIntegerCodeForString("gnre"); private static final int TYPE_GENRE = 0x676e7265;
private static final int TYPE_GROUPING = Util.getIntegerCodeForString("grp"); private static final int TYPE_GROUPING = 0x00677270;
private static final int TYPE_DISK_NUMBER = Util.getIntegerCodeForString("disk"); private static final int TYPE_DISK_NUMBER = 0x6469736b;
private static final int TYPE_TRACK_NUMBER = Util.getIntegerCodeForString("trkn"); private static final int TYPE_TRACK_NUMBER = 0x74726b6e;
private static final int TYPE_TEMPO = Util.getIntegerCodeForString("tmpo"); private static final int TYPE_TEMPO = 0x746d706f;
private static final int TYPE_COMPILATION = Util.getIntegerCodeForString("cpil"); private static final int TYPE_COMPILATION = 0x6370696c;
private static final int TYPE_ALBUM_ARTIST = Util.getIntegerCodeForString("aART"); private static final int TYPE_ALBUM_ARTIST = 0x61415254;
private static final int TYPE_SORT_TRACK_NAME = Util.getIntegerCodeForString("sonm"); private static final int TYPE_SORT_TRACK_NAME = 0x736f6e6d;
private static final int TYPE_SORT_ALBUM = Util.getIntegerCodeForString("soal"); private static final int TYPE_SORT_ALBUM = 0x736f616c;
private static final int TYPE_SORT_ARTIST = Util.getIntegerCodeForString("soar"); private static final int TYPE_SORT_ARTIST = 0x736f6172;
private static final int TYPE_SORT_ALBUM_ARTIST = Util.getIntegerCodeForString("soaa"); private static final int TYPE_SORT_ALBUM_ARTIST = 0x736f6161;
private static final int TYPE_SORT_COMPOSER = Util.getIntegerCodeForString("soco"); private static final int TYPE_SORT_COMPOSER = 0x736f636f;
// Types that do not have equivalent ID3 frames. // Types that do not have equivalent ID3 frames.
private static final int TYPE_RATING = Util.getIntegerCodeForString("rtng"); private static final int TYPE_RATING = 0x72746e67;
private static final int TYPE_GAPLESS_ALBUM = Util.getIntegerCodeForString("pgap"); private static final int TYPE_GAPLESS_ALBUM = 0x70676170;
private static final int TYPE_TV_SORT_SHOW = Util.getIntegerCodeForString("sosn"); private static final int TYPE_TV_SORT_SHOW = 0x736f736e;
private static final int TYPE_TV_SHOW = Util.getIntegerCodeForString("tvsh"); private static final int TYPE_TV_SHOW = 0x74767368;
// Type for items that are intended for internal use by the player. // Type for items that are intended for internal use by the player.
private static final int TYPE_INTERNAL = Util.getIntegerCodeForString("----"); private static final int TYPE_INTERNAL = 0x2d2d2d2d;
private static final int PICTURE_TYPE_FRONT_COVER = 3; private static final int PICTURE_TYPE_FRONT_COVER = 3;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
...@@ -35,7 +35,6 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -35,7 +35,6 @@ import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.NalUnitUtil;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -78,7 +77,7 @@ public final class Mp4Extractor implements Extractor, SeekMap { ...@@ -78,7 +77,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
private static final int STATE_READING_SAMPLE = 2; private static final int STATE_READING_SAMPLE = 2;
/** Brand stored in the ftyp atom for QuickTime media. */ /** Brand stored in the ftyp atom for QuickTime media. */
private static final int BRAND_QUICKTIME = Util.getIntegerCodeForString("qt "); private static final int BRAND_QUICKTIME = 0x71742020;
/** /**
* When seeking within the source, if the offset is greater than or equal to this value (or the * When seeking within the source, if the offset is greater than or equal to this value (or the
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor.mp4; ...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor.mp4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
/** /**
...@@ -32,32 +31,32 @@ import java.io.IOException; ...@@ -32,32 +31,32 @@ import java.io.IOException;
private static final int[] COMPATIBLE_BRANDS = private static final int[] COMPATIBLE_BRANDS =
new int[] { new int[] {
Util.getIntegerCodeForString("isom"), 0x69736f6d, // isom
Util.getIntegerCodeForString("iso2"), 0x69736f32, // iso2
Util.getIntegerCodeForString("iso3"), 0x69736f33, // iso3
Util.getIntegerCodeForString("iso4"), 0x69736f34, // iso4
Util.getIntegerCodeForString("iso5"), 0x69736f35, // iso5
Util.getIntegerCodeForString("iso6"), 0x69736f36, // iso6
Util.getIntegerCodeForString("avc1"), 0x61766331, // avc1
Util.getIntegerCodeForString("hvc1"), 0x68766331, // hvc1
Util.getIntegerCodeForString("hev1"), 0x68657631, // hev1
Util.getIntegerCodeForString("av01"), 0x61763031, // av01
Util.getIntegerCodeForString("mp41"), 0x6d703431, // mp41
Util.getIntegerCodeForString("mp42"), 0x6d703432, // mp42
Util.getIntegerCodeForString("3g2a"), 0x33673261, // 3g2a
Util.getIntegerCodeForString("3g2b"), 0x33673262, // 3g2b
Util.getIntegerCodeForString("3gr6"), 0x33677236, // 3gr6
Util.getIntegerCodeForString("3gs6"), 0x33677336, // 3gs6
Util.getIntegerCodeForString("3ge6"), 0x33676536, // 3ge6
Util.getIntegerCodeForString("3gg6"), 0x33676736, // 3gg6
Util.getIntegerCodeForString("M4V "), 0x4d345620, // M4V[space]
Util.getIntegerCodeForString("M4A "), 0x4d344120, // M4A[space]
Util.getIntegerCodeForString("f4v "), 0x66347620, // f4v[space]
Util.getIntegerCodeForString("kddi"), 0x6b646469, // kddi
Util.getIntegerCodeForString("M4VP"), 0x4d345650, // M4VP
Util.getIntegerCodeForString("qt "), // Apple QuickTime 0x71742020, // qt[space][space], Apple QuickTime
Util.getIntegerCodeForString("MSNV"), // Sony PSP 0x4d534e56, // MSNV, Sony PSP
Util.getIntegerCodeForString("dby1"), // Dolby Vision 0x64627931, // dby1, Dolby Vision
}; };
/** /**
...@@ -188,7 +187,7 @@ import java.io.IOException; ...@@ -188,7 +187,7 @@ import java.io.IOException;
*/ */
private static boolean isCompatibleBrand(int brand) { private static boolean isCompatibleBrand(int brand) {
// Accept all brands starting '3gp'. // Accept all brands starting '3gp'.
if (brand >>> 8 == Util.getIntegerCodeForString("3gp")) { if (brand >>> 8 == 0x00336770) {
return true; return true;
} }
for (int compatibleBrand : COMPATIBLE_BRANDS) { for (int compatibleBrand : COMPATIBLE_BRANDS) {
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java
...@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C; ...@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
...@@ -34,7 +33,7 @@ import java.io.IOException; ...@@ -34,7 +33,7 @@ import java.io.IOException;
public static final int MAX_PAGE_SIZE = EMPTY_PAGE_HEADER_SIZE + MAX_SEGMENT_COUNT public static final int MAX_PAGE_SIZE = EMPTY_PAGE_HEADER_SIZE + MAX_SEGMENT_COUNT
+ MAX_PAGE_PAYLOAD; + MAX_PAGE_PAYLOAD;
private static final int TYPE_OGGS = Util.getIntegerCodeForString("OggS"); private static final int TYPE_OGGS = 0x4f676753;
public int revision; public int revision;
public int type; public int type;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
...@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C; ...@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -38,7 +37,7 @@ import java.util.List; ...@@ -38,7 +37,7 @@ import java.util.List;
*/ */
private static final int SAMPLE_RATE = 48000; private static final int SAMPLE_RATE = 48000;
private static final int OPUS_CODE = Util.getIntegerCodeForString("Opus"); private static final int OPUS_CODE = 0x4f707573;
private static final byte[] OPUS_SIGNATURE = {'O', 'p', 'u', 's', 'H', 'e', 'a', 'd'}; private static final byte[] OPUS_SIGNATURE = {'O', 'p', 'u', 's', 'H', 'e', 'a', 'd'};
private boolean headerRead; private boolean headerRead;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java
...@@ -25,7 +25,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder; ...@@ -25,7 +25,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
/** /**
...@@ -35,7 +34,7 @@ public final class RawCcExtractor implements Extractor { ...@@ -35,7 +34,7 @@ public final class RawCcExtractor implements Extractor {
private static final int SCRATCH_SIZE = 9; private static final int SCRATCH_SIZE = 9;
private static final int HEADER_SIZE = 8; private static final int HEADER_SIZE = 8;
private static final int HEADER_ID = Util.getIntegerCodeForString("RCC\u0001"); private static final int HEADER_ID = 0x52434301;
private static final int TIMESTAMP_SIZE_V0 = 4; private static final int TIMESTAMP_SIZE_V0 = 4;
private static final int TIMESTAMP_SIZE_V1 = 8; private static final int TIMESTAMP_SIZE_V1 = 8;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder; ...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator; import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
/** /**
...@@ -45,7 +44,7 @@ public final class Ac3Extractor implements Extractor { ...@@ -45,7 +44,7 @@ public final class Ac3Extractor implements Extractor {
private static final int MAX_SNIFF_BYTES = 8 * 1024; private static final int MAX_SNIFF_BYTES = 8 * 1024;
private static final int AC3_SYNC_WORD = 0x0B77; private static final int AC3_SYNC_WORD = 0x0B77;
private static final int MAX_SYNC_FRAME_SIZE = 2786; private static final int MAX_SYNC_FRAME_SIZE = 2786;
private static final int ID3_TAG = Util.getIntegerCodeForString("ID3"); private static final int ID3_TAG = 0x00494433;
private final long firstSampleTimestampUs; private final long firstSampleTimestampUs;
private final Ac3Reader reader; private final Ac3Reader reader;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java
...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder; ...@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator; import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
/** Extracts data from AC-4 bitstreams. */ /** Extracts data from AC-4 bitstreams. */
...@@ -53,7 +52,7 @@ public final class Ac4Extractor implements Extractor { ...@@ -53,7 +52,7 @@ public final class Ac4Extractor implements Extractor {
/** The size of the frame header, in bytes. */ /** The size of the frame header, in bytes. */
private static final int FRAME_HEADER_SIZE = 7; private static final int FRAME_HEADER_SIZE = 7;
private static final int ID3_TAG = Util.getIntegerCodeForString("ID3"); private static final int ID3_TAG = 0x00494433;
private final long firstSampleTimestampUs; private final long firstSampleTimestampUs;
private final Ac4Reader reader; private final Ac4Reader reader;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
...@@ -32,7 +32,6 @@ import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerat ...@@ -32,7 +32,6 @@ import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerat
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableBitArray;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -66,7 +65,7 @@ public final class AdtsExtractor implements Extractor { ...@@ -66,7 +65,7 @@ public final class AdtsExtractor implements Extractor {
public static final int FLAG_ENABLE_CONSTANT_BITRATE_SEEKING = 1; public static final int FLAG_ENABLE_CONSTANT_BITRATE_SEEKING = 1;
private static final int MAX_PACKET_SIZE = 2 * 1024; private static final int MAX_PACKET_SIZE = 2 * 1024;
private static final int ID3_TAG = Util.getIntegerCodeForString("ID3"); private static final int ID3_TAG = 0x00494433;
/** /**
* The maximum number of bytes to search when sniffing, excluding the header, before giving up. * The maximum number of bytes to search when sniffing, excluding the header, before giving up.
* Frame sizes are represented by 13-bit fields, so expect a valid frame in the first 8192 bytes. * Frame sizes are represented by 13-bit fields, so expect a valid frame in the first 8192 bytes.
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
...@@ -101,10 +101,10 @@ public final class TsExtractor implements Extractor { ...@@ -101,10 +101,10 @@ public final class TsExtractor implements Extractor {
private static final int TS_PAT_PID = 0; private static final int TS_PAT_PID = 0;
private static final int MAX_PID_PLUS_ONE = 0x2000; private static final int MAX_PID_PLUS_ONE = 0x2000;
private static final long AC3_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("AC-3"); private static final long AC3_FORMAT_IDENTIFIER = 0x41432d33;
private static final long E_AC3_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("EAC3"); private static final long E_AC3_FORMAT_IDENTIFIER = 0x45414333;
private static final long AC4_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("AC-4"); private static final long AC4_FORMAT_IDENTIFIER = 0x41432d34;
private static final long HEVC_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("HEVC"); private static final long HEVC_FORMAT_IDENTIFIER = 0x48455643;
private static final int BUFFER_SIZE = TS_PACKET_SIZE * 50; private static final int BUFFER_SIZE = TS_PACKET_SIZE * 50;
private static final int SNIFF_TS_PACKET_COUNT = 5; private static final int SNIFF_TS_PACKET_COUNT = 5;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java
...@@ -22,7 +22,6 @@ import com.google.android.exoplayer2.extractor.ExtractorInput; ...@@ -22,7 +22,6 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
/** Reads a {@code WavHeader} from an input stream; supports resuming from input failures. */ /** Reads a {@code WavHeader} from an input stream; supports resuming from input failures. */
...@@ -122,11 +121,13 @@ import java.io.IOException; ...@@ -122,11 +121,13 @@ import java.io.IOException;
ParsableByteArray scratch = new ParsableByteArray(ChunkHeader.SIZE_IN_BYTES); ParsableByteArray scratch = new ParsableByteArray(ChunkHeader.SIZE_IN_BYTES);
// Skip all chunks until we hit the data header. // Skip all chunks until we hit the data header.
ChunkHeader chunkHeader = ChunkHeader.peek(input, scratch); ChunkHeader chunkHeader = ChunkHeader.peek(input, scratch);
while (chunkHeader.id != Util.getIntegerCodeForString("data")) { final int data = 0x64617461;
while (chunkHeader.id != data) {
Log.w(TAG, "Ignoring unknown WAV chunk: " + chunkHeader.id); Log.w(TAG, "Ignoring unknown WAV chunk: " + chunkHeader.id);
long bytesToSkip = ChunkHeader.SIZE_IN_BYTES + chunkHeader.size; long bytesToSkip = ChunkHeader.SIZE_IN_BYTES + chunkHeader.size;
// Override size of RIFF chunk, since it describes its size as the entire file. // Override size of RIFF chunk, since it describes its size as the entire file.
if (chunkHeader.id == Util.getIntegerCodeForString("RIFF")) { final int riff = 0x52494646;
if (chunkHeader.id == riff) {
bytesToSkip = ChunkHeader.SIZE_IN_BYTES + 4; bytesToSkip = ChunkHeader.SIZE_IN_BYTES + 4;
} }
if (bytesToSkip > Integer.MAX_VALUE) { if (bytesToSkip > Integer.MAX_VALUE) {
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
...@@ -61,10 +61,8 @@ public final class Id3Decoder implements MetadataDecoder { ...@@ -61,10 +61,8 @@ public final class Id3Decoder implements MetadataDecoder {
private static final String TAG = "Id3Decoder"; private static final String TAG = "Id3Decoder";
/** /** The first three bytes of a well formed ID3 tag header. */
* The first three bytes of a well formed ID3 tag header. public static final int ID3_TAG = 0x00494433;
*/
public static final int ID3_TAG = Util.getIntegerCodeForString("ID3");
/** /**
* Length of an ID3 tag header. * Length of an ID3 tag header.
*/ */
......
library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java
...@@ -19,14 +19,13 @@ import com.google.android.exoplayer2.C; ...@@ -19,14 +19,13 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
/** Utility methods for handling CEA-608/708 messages. Defined in A/53 Part 4:2009. */ /** Utility methods for handling CEA-608/708 messages. Defined in A/53 Part 4:2009. */
public final class CeaUtil { public final class CeaUtil {
private static final String TAG = "CeaUtil"; private static final String TAG = "CeaUtil";
public static final int USER_DATA_IDENTIFIER_GA94 = Util.getIntegerCodeForString("GA94"); public static final int USER_DATA_IDENTIFIER_GA94 = 0x47413934;
public static final int USER_DATA_TYPE_CODE_MPEG_CC = 0x3; public static final int USER_DATA_TYPE_CODE_MPEG_CC = 0x3;
private static final int PAYLOAD_TYPE_CC = 4; private static final int PAYLOAD_TYPE_CC = 4;
......
library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java
...@@ -43,8 +43,8 @@ public final class Tx3gDecoder extends SimpleSubtitleDecoder { ...@@ -43,8 +43,8 @@ public final class Tx3gDecoder extends SimpleSubtitleDecoder {
private static final char BOM_UTF16_BE = '\uFEFF'; private static final char BOM_UTF16_BE = '\uFEFF';
private static final char BOM_UTF16_LE = '\uFFFE'; private static final char BOM_UTF16_LE = '\uFFFE';
private static final int TYPE_STYL = Util.getIntegerCodeForString("styl"); private static final int TYPE_STYL = 0x7374796c;
private static final int TYPE_TBOX = Util.getIntegerCodeForString("tbox"); private static final int TYPE_TBOX = 0x74626f78;
private static final String TX3G_SERIF = "Serif"; private static final String TX3G_SERIF = "Serif";
private static final int SIZE_ATOM_HEADER = 8; private static final int SIZE_ATOM_HEADER = 8;
......
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
...@@ -31,13 +31,13 @@ public final class Mp4WebvttDecoder extends SimpleSubtitleDecoder { ...@@ -31,13 +31,13 @@ public final class Mp4WebvttDecoder extends SimpleSubtitleDecoder {
private static final int BOX_HEADER_SIZE = 8; private static final int BOX_HEADER_SIZE = 8;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_payl = Util.getIntegerCodeForString("payl"); private static final int TYPE_payl = 0x7061796c;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_sttg = Util.getIntegerCodeForString("sttg"); private static final int TYPE_sttg = 0x73747467;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
private static final int TYPE_vttc = Util.getIntegerCodeForString("vttc"); private static final int TYPE_vttc = 0x76747463;
private final ParsableByteArray sampleData; private final ParsableByteArray sampleData;
private final WebvttCue.Builder builder; private final WebvttCue.Builder builder;
......
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
...@@ -36,12 +36,12 @@ import java.util.zip.Inflater; ...@@ -36,12 +36,12 @@ import java.util.zip.Inflater;
*/ */
public final class ProjectionDecoder { public final class ProjectionDecoder {
private static final int TYPE_YTMP = Util.getIntegerCodeForString("ytmp"); private static final int TYPE_YTMP = 0x79746d70;
private static final int TYPE_MSHP = Util.getIntegerCodeForString("mshp"); private static final int TYPE_MSHP = 0x6d736870;
private static final int TYPE_RAW = Util.getIntegerCodeForString("raw "); private static final int TYPE_RAW = 0x72617720;
private static final int TYPE_DFL8 = Util.getIntegerCodeForString("dfl8"); private static final int TYPE_DFL8 = 0x64666c38;
private static final int TYPE_MESH = Util.getIntegerCodeForString("mesh"); private static final int TYPE_MESH = 0x6d657368;
private static final int TYPE_PROJ = Util.getIntegerCodeForString("proj"); private static final int TYPE_PROJ = 0x70726f6a;
// Sanity limits to prevent a bad file from creating an OOM situation. We don't expect a mesh to // Sanity limits to prevent a bad file from creating an OOM situation. We don't expect a mesh to
// exceed these limits. // exceed these limits.
......
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