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

Clarify comments

Browse Source 
Clarify that null-termianted multi-value separators are specific to
ID3v2.4.
This commit is contained in:
Alexander Capehart 2022-09-07 20:57:53 -06:00
parent b125a2b0b3
commit 0cdece3a3f
No known key found for this signature in database
GPG Key ID: 37DBE3621FE9AD47
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
View File

@ -460,9 +460,9 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
int descriptionEndIndex = indexOfEos(data, 0, encoding); int descriptionEndIndex = indexOfEos(data, 0, encoding);
String description = new String(data, 0, descriptionEndIndex, charset); String description = new String(data, 0, descriptionEndIndex, charset);
// Text information frames can contain multiple values delimited by a null terminator. // In ID3v2.4, text information frames can contain multiple values delimited by a null
// Thus, we after each "end of stream" marker we actually need to keep looking for more // terminator. Thus, we after each "end of stream" marker we actually need to keep looking
// data, at least until the index is equal to the data length. // for more data, at least until the index is equal to the data length.
ArrayList<String> values = new ArrayList<>(); ArrayList<String> values = new ArrayList<>();
int valueStartIndex = descriptionEndIndex + delimiterLength(encoding); int valueStartIndex = descriptionEndIndex + delimiterLength(encoding);
@ -475,7 +475,6 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
valueEndIndex = indexOfEos(data, valueStartIndex, encoding); valueEndIndex = indexOfEos(data, valueStartIndex, encoding);
} }
return new TextInformationFrame("TXXX", description, values.toArray(new String[0])); return new TextInformationFrame("TXXX", description, values.toArray(new String[0]));
} }
@ -493,9 +492,9 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
byte[] data = new byte[frameSize - 1]; byte[] data = new byte[frameSize - 1];
id3Data.readBytes(data, 0, frameSize - 1); id3Data.readBytes(data, 0, frameSize - 1);
// Text information frames can contain multiple values delimited by a null terminator. // In ID3v2.4, text information frames can contain multiple values delimited by a null
// Thus, we after each "end of stream" marker we actually need to keep looking for more // terminator. Thus, we after each "end of stream" marker we actually need to keep looking
// data, at least until the index is equal to the data length. // for more data, at least until the index is equal to the data length.
ArrayList<String> values = new ArrayList<>(); ArrayList<String> values = new ArrayList<>();
int valueStartIndex = 0; int valueStartIndex = 0;