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

Fix parsing of QT sample desc version 2.

Browse Source 
Also support "lpcm" and "sowt" sample descriptors.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=120334017
This commit is contained in:
olly 2016-04-20 07:16:12 -07:00 committed by Oliver Woodman
parent 2a37b02ee2
commit b3f732cd05
3 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/main/java/com/google/android/exoplayer/extractor/mp4/Atom.java
View File

@ -54,6 +54,8 @@ import java.util.List;
public static final int TYPE_mdat = Util.getIntegerCodeForString("mdat"); public static final int TYPE_mdat = Util.getIntegerCodeForString("mdat");
public static final int TYPE_mp4a = Util.getIntegerCodeForString("mp4a"); public static final int TYPE_mp4a = Util.getIntegerCodeForString("mp4a");
public static final int TYPE_wave = Util.getIntegerCodeForString("wave"); public static final int TYPE_wave = Util.getIntegerCodeForString("wave");
public static final int TYPE_lpcm = Util.getIntegerCodeForString("lpcm");
public static final int TYPE_sowt = Util.getIntegerCodeForString("sowt");
public static final int TYPE_ac_3 = Util.getIntegerCodeForString("ac-3"); public static final int TYPE_ac_3 = Util.getIntegerCodeForString("ac-3");
public static final int TYPE_dac3 = Util.getIntegerCodeForString("dac3"); public static final int TYPE_dac3 = Util.getIntegerCodeForString("dac3");
public static final int TYPE_ec_3 = Util.getIntegerCodeForString("ec-3"); public static final int TYPE_ec_3 = Util.getIntegerCodeForString("ec-3");

34
library/src/main/java/com/google/android/exoplayer/extractor/mp4/AtomParsers.java
View File

@ -569,7 +569,8 @@ import java.util.List;
|| childAtomType == Atom.TYPE_ac_3 || childAtomType == Atom.TYPE_ec_3 || childAtomType == Atom.TYPE_ac_3 || childAtomType == Atom.TYPE_ec_3
|| childAtomType == Atom.TYPE_dtsc || childAtomType == Atom.TYPE_dtse || childAtomType == Atom.TYPE_dtsc || childAtomType == Atom.TYPE_dtse
|| childAtomType == Atom.TYPE_dtsh || childAtomType == Atom.TYPE_dtsl || childAtomType == Atom.TYPE_dtsh || childAtomType == Atom.TYPE_dtsl
|| childAtomType == Atom.TYPE_samr || childAtomType == Atom.TYPE_sawb) { || childAtomType == Atom.TYPE_samr || childAtomType == Atom.TYPE_sawb
|| childAtomType == Atom.TYPE_lpcm || childAtomType == Atom.TYPE_sowt) {
parseAudioSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId, parseAudioSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId,
language, isQuickTime, out, i); language, isQuickTime, out, i);
} else if (childAtomType == Atom.TYPE_TTML) { } else if (childAtomType == Atom.TYPE_TTML) {
@ -827,16 +828,29 @@ import java.util.List;
parent.skipBytes(16); parent.skipBytes(16);
} }
int channelCount = parent.readUnsignedShort(); int channelCount;
int sampleSize = parent.readUnsignedShort(); int sampleRate;
parent.skipBytes(4);
int sampleRate = parent.readUnsignedFixedPoint1616();
if (quickTimeSoundDescriptionVersion > 0) { if (quickTimeSoundDescriptionVersion == 0 || quickTimeSoundDescriptionVersion == 1) {
channelCount = parent.readUnsignedShort();
parent.skipBytes(6); // sampleSize, compressionId, packetSize.
sampleRate = parent.readUnsignedFixedPoint1616();
if (quickTimeSoundDescriptionVersion == 1) {
parent.skipBytes(16); parent.skipBytes(16);
if (quickTimeSoundDescriptionVersion == 2) {
parent.skipBytes(20);
} }
} else if (quickTimeSoundDescriptionVersion == 2) {
parent.skipBytes(16); // always[3,16,Minus2,0,65536], sizeOfStructOnly
sampleRate = (int) Math.round(parent.readDouble());
channelCount = parent.readUnsignedIntToInt();
// Skip always7F000000, sampleSize, formatSpecificFlags, constBytesPerAudioPacket,
// constLPCMFramesPerAudioPacket.
parent.skipBytes(20);
} else {
// Unsupported version.
return;
} }
// If the atom type determines a MIME type, set it immediately. // If the atom type determines a MIME type, set it immediately.
@ -855,6 +869,8 @@ import java.util.List;
mimeType = MimeTypes.AUDIO_AMR_NB; mimeType = MimeTypes.AUDIO_AMR_NB;
} else if (atomType == Atom.TYPE_sawb) { } else if (atomType == Atom.TYPE_sawb) {
mimeType = MimeTypes.AUDIO_AMR_WB; mimeType = MimeTypes.AUDIO_AMR_WB;
} else if (atomType == Atom.TYPE_lpcm || atomType == Atom.TYPE_sowt) {
mimeType = MimeTypes.AUDIO_RAW;
} }
byte[] initializationData = null; byte[] initializationData = null;
@ -914,7 +930,7 @@ import java.util.List;
} }
out.format = Format.createAudioSampleFormat(Integer.toString(trackId), mimeType, out.format = Format.createAudioSampleFormat(Integer.toString(trackId), mimeType,
Format.NO_VALUE, sampleSize, channelCount, sampleRate, Format.NO_VALUE, Format.NO_VALUE, channelCount, sampleRate,
initializationData == null ? null : Collections.singletonList(initializationData), initializationData == null ? null : Collections.singletonList(initializationData),
language); language);
} }

5
library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java
View File

@ -328,6 +328,11 @@ public final class ParsableByteArray {
return result; return result;
} }
/** Reads the next eight bytes as a 64-bit floating point value. */
public double readDouble() {
return Double.longBitsToDouble(readLong());
}
/** /**
* Reads the next {@code length} bytes as UTF-8 characters. * Reads the next {@code length} bytes as UTF-8 characters.
* *