From f604ee59d1e3c3ba7c90f0bb98a606a62ec8951a Mon Sep 17 00:00:00 2001 From: Dustin Date: Tue, 15 Feb 2022 10:31:37 -0700 Subject: [PATCH] Changed constants to literals. --- .../exoplayer2/extractor/avi/AudioFormat.java | 15 +++++---------- .../exoplayer2/extractor/avi/AudioFormatTest.java | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AudioFormat.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AudioFormat.java index 479da0b7dc..98e1fed5ba 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AudioFormat.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AudioFormat.java @@ -23,18 +23,13 @@ import java.nio.ByteBuffer; * Wrapper for the WAVEFORMATEX structure */ public class AudioFormat { - public static final short WAVE_FORMAT_PCM = 1; - static final short WAVE_FORMAT_AAC = 0xff; - private static final short WAVE_FORMAT_MPEGLAYER3 = 0x55; - private static final short WAVE_FORMAT_DVM = 0x2000; //AC3 - private static final short WAVE_FORMAT_DTS2 = 0x2001; //DTS private static final SparseArray FORMAT_MAP = new SparseArray<>(); static { - FORMAT_MAP.put(WAVE_FORMAT_PCM, MimeTypes.AUDIO_RAW); - FORMAT_MAP.put(WAVE_FORMAT_MPEGLAYER3, MimeTypes.AUDIO_MPEG); - FORMAT_MAP.put(WAVE_FORMAT_AAC, MimeTypes.AUDIO_AAC); - FORMAT_MAP.put(WAVE_FORMAT_DVM, MimeTypes.AUDIO_AC3); - FORMAT_MAP.put(WAVE_FORMAT_DTS2, MimeTypes.AUDIO_DTS); + FORMAT_MAP.put(0x1, MimeTypes.AUDIO_RAW); // WAVE_FORMAT_PCM + FORMAT_MAP.put(0x55, MimeTypes.AUDIO_MPEG); // WAVE_FORMAT_MPEGLAYER3 + FORMAT_MAP.put(0xff, MimeTypes.AUDIO_AAC); // WAVE_FORMAT_AAC + FORMAT_MAP.put(0x2000, MimeTypes.AUDIO_AC3); // WAVE_FORMAT_DVM - AC3 + FORMAT_MAP.put(0x2001, MimeTypes.AUDIO_DTS); // WAVE_FORMAT_DTS2 } private final ByteBuffer byteBuffer; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/avi/AudioFormatTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/avi/AudioFormatTest.java index cfb084b9b5..8207e14b6e 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/avi/AudioFormatTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/avi/AudioFormatTest.java @@ -32,7 +32,7 @@ public class AudioFormatTest { final AudioFormat audioFormat = streamFormatBox.getAudioFormat(); Assert.assertEquals(MimeTypes.AUDIO_AAC, audioFormat.getMimeType()); Assert.assertEquals(2, audioFormat.getChannels()); - Assert.assertEquals(AudioFormat.WAVE_FORMAT_AAC, audioFormat.getFormatTag()); + Assert.assertEquals(0xff, audioFormat.getFormatTag()); // AAC Assert.assertEquals(48000, audioFormat.getSamplesPerSecond()); Assert.assertEquals(0, audioFormat.getBitsPerSample()); //Not meaningful for AAC Assert.assertArrayEquals(CODEC_PRIVATE, audioFormat.getCodecData());