sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue in the calculation of size of objectData

Browse source 
- Fixed issue in the calculation of size of objectData
- Indentation fixes
This commit is contained in:
J. Oliva 2015-02-27 22:09:05 +01:00
parent 1739af685a
commit 88475e4fee
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/src/main/java/com/google/android/exoplayer/metadata/Id3Parser.java
View file

@ -70,7 +70,7 @@ public class Id3Parser implements MetadataParser<Map<String, Object>> {
int valueStartIndex = firstZeroIndex + delimiterLength(encoding); int valueStartIndex = firstZeroIndex + delimiterLength(encoding);
int valueEndIndex = indexOfEOS(frame, valueStartIndex, encoding); int valueEndIndex = indexOfEOS(frame, valueStartIndex, encoding);
String value = new String(frame, valueStartIndex, valueEndIndex - valueStartIndex, String value = new String(frame, valueStartIndex, valueEndIndex - valueStartIndex,
charset); charset);
metadata.put(TxxxMetadata.TYPE, new TxxxMetadata(description, value)); metadata.put(TxxxMetadata.TYPE, new TxxxMetadata(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 // Check frame ID == PRIV
@ -94,17 +94,19 @@ public class Id3Parser implements MetadataParser<Map<String, Object>> {
int filenameStartIndex = firstZeroIndex + delimiterLength(encoding); int filenameStartIndex = firstZeroIndex + delimiterLength(encoding);
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);
byte[] objectData = new byte[frameSize - descriptionEndIndex - 2]; int objectDataSize = frameSize - 1 /* encoding byte */ - descriptionEndIndex -
delimiterLength(encoding);
byte[] objectData = new byte[objectDataSize];
System.arraycopy(frame, descriptionEndIndex + delimiterLength(encoding), objectData, 0, System.arraycopy(frame, descriptionEndIndex + delimiterLength(encoding), objectData, 0,
frameSize - descriptionEndIndex - 2); objectDataSize);
metadata.put(GeobMetadata.TYPE, new GeobMetadata(mimeType, filename, metadata.put(GeobMetadata.TYPE, new GeobMetadata(mimeType, filename,
description, objectData)); description, objectData));
} else { } else {
String type = String.format("%c%c%c%c", frameId0, frameId1, frameId2, frameId3); String type = String.format("%c%c%c%c", frameId0, frameId1, frameId2, frameId3);
byte[] frame = new byte[frameSize]; byte[] frame = new byte[frameSize];