loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 07:30:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed constants to literals.

Browse Source
This commit is contained in:
Dustin 2022-02-15 10:31:37 -07:00
parent ac96a2be65
commit f604ee59d1
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AudioFormat.java
View File

@ -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<String> 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;

2
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/avi/AudioFormatTest.java
View File

@ -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());