loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ID3 parsing improvements from GitHub.

Browse Source 
- Parse APIC and TextInformation frames.
- In MPEG-TS, don't mind if packets contain end padding.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=122743786
This commit is contained in:
olly 2016-05-19 10:16:44 -07:00 committed by Oliver Woodman
parent 83b43a6fe6
commit 7465db2a22
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/src/main/java/com/google/android/exoplayer/metadata/id3/Id3Parser.java
View File

@ -22,6 +22,7 @@ import com.google.android.exoplayer.util.ParsableByteArray;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -60,52 +61,53 @@ public final class Id3Parser implements MetadataParser<List<Id3Frame>> {
// Skip frame flags. // Skip frame flags.
id3Data.skipBytes(2); id3Data.skipBytes(2);
// Check Frame ID == TXXX.
if (frameId0 == 'T' && frameId1 == 'X' && frameId2 == 'X' && frameId3 == 'X') { if (frameId0 == 'T' && frameId1 == 'X' && frameId2 == 'X' && frameId3 == 'X') {
int encoding = id3Data.readUnsignedByte(); int encoding = id3Data.readUnsignedByte();
String charset = getCharsetName(encoding); String charset = getCharsetName(encoding);
byte[] frame = new byte[frameSize - 1]; byte[] frame = new byte[frameSize - 1];
id3Data.readBytes(frame, 0, frameSize - 1); id3Data.readBytes(frame, 0, frameSize - 1);
int firstZeroIndex = indexOfEOS(frame, 0, encoding); int descriptionEndIndex = indexOfEOS(frame, 0, encoding);
String description = new String(frame, 0, firstZeroIndex, charset); String description = new String(frame, 0, descriptionEndIndex, charset);
int valueStartIndex = firstZeroIndex + delimiterLength(encoding);
int valueStartIndex = descriptionEndIndex + delimiterLength(encoding);
int valueEndIndex = indexOfEOS(frame, valueStartIndex, encoding); int valueEndIndex = indexOfEOS(frame, valueStartIndex, encoding);
String value = new String(frame, valueStartIndex, valueEndIndex - valueStartIndex, charset); String value = new String(frame, valueStartIndex, valueEndIndex - valueStartIndex, charset);
id3Frames.add(new TxxxFrame(description, value)); id3Frames.add(new TxxxFrame(description, value));
} else if (frameId0 == 'P' && frameId1 == 'R' && frameId2 == 'I' && frameId3 == 'V') { } else if (frameId0 == 'P' && frameId1 == 'R' && frameId2 == 'I' && frameId3 == 'V') {
// Check frame ID == PRIV
byte[] frame = new byte[frameSize]; byte[] frame = new byte[frameSize];
id3Data.readBytes(frame, 0, frameSize); id3Data.readBytes(frame, 0, frameSize);
int firstZeroIndex = indexOf(frame, 0, (byte) 0); int ownerEndIndex = indexOf(frame, 0, (byte) 0);
String owner = new String(frame, 0, firstZeroIndex, "ISO-8859-1"); String owner = new String(frame, 0, ownerEndIndex, "ISO-8859-1");
byte[] privateData = new byte[frameSize - firstZeroIndex - 1];
System.arraycopy(frame, firstZeroIndex + 1, privateData, 0, frameSize - firstZeroIndex - 1); byte[] privateData = Arrays.copyOfRange(frame, ownerEndIndex + 1, frame.length);
id3Frames.add(new PrivFrame(owner, privateData)); id3Frames.add(new PrivFrame(owner, privateData));
} else if (frameId0 == 'G' && frameId1 == 'E' && frameId2 == 'O' && frameId3 == 'B') { } else if (frameId0 == 'G' && frameId1 == 'E' && frameId2 == 'O' && frameId3 == 'B') {
// Check frame ID == GEOB
int encoding = id3Data.readUnsignedByte(); int encoding = id3Data.readUnsignedByte();
String charset = getCharsetName(encoding); String charset = getCharsetName(encoding);
byte[] frame = new byte[frameSize - 1]; byte[] frame = new byte[frameSize - 1];
id3Data.readBytes(frame, 0, frameSize - 1); id3Data.readBytes(frame, 0, frameSize - 1);
int firstZeroIndex = indexOf(frame, 0, (byte) 0); int mimeTypeEndIndex = indexOf(frame, 0, (byte) 0);
String mimeType = new String(frame, 0, firstZeroIndex, "ISO-8859-1"); String mimeType = new String(frame, 0, mimeTypeEndIndex, "ISO-8859-1");
int filenameStartIndex = firstZeroIndex + 1;
int filenameStartIndex = mimeTypeEndIndex + 1;
int filenameEndIndex = indexOfEOS(frame, filenameStartIndex, encoding); int filenameEndIndex = indexOfEOS(frame, filenameStartIndex, encoding);
String filename = new String(frame, filenameStartIndex, String filename = new String(frame, filenameStartIndex,
filenameEndIndex - filenameStartIndex, charset); filenameEndIndex - filenameStartIndex, charset);
int descriptionStartIndex = filenameEndIndex + delimiterLength(encoding); int descriptionStartIndex = filenameEndIndex + delimiterLength(encoding);
int descriptionEndIndex = indexOfEOS(frame, descriptionStartIndex, encoding); int descriptionEndIndex = indexOfEOS(frame, descriptionStartIndex, encoding);
String description = new String(frame, descriptionStartIndex, String description = new String(frame, descriptionStartIndex,
descriptionEndIndex - descriptionStartIndex, charset); descriptionEndIndex - descriptionStartIndex, charset);
int objectDataSize = frameSize - 1 /* encoding byte */ - descriptionEndIndex int objectDataStartIndex = descriptionEndIndex + delimiterLength(encoding);
- delimiterLength(encoding); byte[] objectData = Arrays.copyOfRange(frame, objectDataStartIndex, frame.length);
byte[] objectData = new byte[objectDataSize];
System.arraycopy(frame, descriptionEndIndex + delimiterLength(encoding), objectData, 0,
objectDataSize);
id3Frames.add(new GeobFrame(mimeType, filename, description, objectData)); id3Frames.add(new GeobFrame(mimeType, filename, description, objectData));
} else { } else {
String type = String.format(Locale.US, "%c%c%c%c", frameId0, frameId1, frameId2, frameId3); String type = String.format(Locale.US, "%c%c%c%c", frameId0, frameId1, frameId2, frameId3);