Rename eos terminology

Rename indexOfEos to indexOfTerminator to better reflect how a
terminator != the end of a frame now.

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

@@ -29,10 +29,8 @@ import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Locale;
 import java.util.Locale;
-import org.w3c.dom.Text;
 
 
 /** Decodes ID3 tags. */
 /** Decodes ID3 tags. */
 public final class Id3Decoder extends SimpleMetadataDecoder {
 public final class Id3Decoder extends SimpleMetadataDecoder {
@@ -457,22 +455,22 @@ 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);
 
 
-    int descriptionEndIndex = indexOfEos(data, 0, encoding);
+    int descriptionEndIndex = indexOfTerminator(data, 0, encoding);
     String description = new String(data, 0, descriptionEndIndex, charset);
     String description = new String(data, 0, descriptionEndIndex, charset);
-    
+
     // In ID3v2.4, text information frames can contain multiple values delimited by a null
     // In ID3v2.4, text information frames can contain multiple values delimited by a null
     // terminator. Thus, we after each "end of stream" marker we actually need to keep looking
     // terminator. Thus, we after each "end of stream" marker we actually need to keep looking
     // for more 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);
-    int valueEndIndex = indexOfEos(data, valueStartIndex, encoding);
+    int valueEndIndex = indexOfTerminator(data, valueStartIndex, encoding);
     while (valueStartIndex < valueEndIndex) {
     while (valueStartIndex < valueEndIndex) {
       String value = decodeStringIfValid(data, valueStartIndex, valueEndIndex, charset);
       String value = decodeStringIfValid(data, valueStartIndex, valueEndIndex, charset);
       values.add(value);
       values.add(value);
 
 
       valueStartIndex = valueEndIndex + delimiterLength(encoding);
       valueStartIndex = valueEndIndex + delimiterLength(encoding);
-      valueEndIndex = indexOfEos(data, valueStartIndex, encoding);
+      valueEndIndex = indexOfTerminator(data, valueStartIndex, encoding);
     }
     }
 
 
     return new TextInformationFrame("TXXX", description, values.toArray(new String[0]));
     return new TextInformationFrame("TXXX", description, values.toArray(new String[0]));
@@ -498,13 +496,13 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
     ArrayList<String> values = new ArrayList<>();
     ArrayList<String> values = new ArrayList<>();
 
 
     int valueStartIndex = 0;
     int valueStartIndex = 0;
-    int valueEndIndex = indexOfEos(data, valueStartIndex, encoding);
+    int valueEndIndex = indexOfTerminator(data, valueStartIndex, encoding);
     while (valueStartIndex < valueEndIndex) {
     while (valueStartIndex < valueEndIndex) {
       String value = decodeStringIfValid(data, valueStartIndex, valueEndIndex, charset);
       String value = decodeStringIfValid(data, valueStartIndex, valueEndIndex, charset);
       values.add(value);
       values.add(value);
 
 
       valueStartIndex = valueEndIndex + delimiterLength(encoding);
       valueStartIndex = valueEndIndex + delimiterLength(encoding);
-      valueEndIndex = indexOfEos(data, valueStartIndex, encoding);
+      valueEndIndex = indexOfTerminator(data, valueStartIndex, encoding);
     }
     }
 
 
     return new TextInformationFrame(id, null, values.toArray(new String[0]));
     return new TextInformationFrame(id, null, values.toArray(new String[0]));
@@ -524,7 +522,7 @@ 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);
 
 
-    int descriptionEndIndex = indexOfEos(data, 0, encoding);
+    int descriptionEndIndex = indexOfTerminator(data, 0, encoding);
     String description = new String(data, 0, descriptionEndIndex, charset);
     String description = new String(data, 0, descriptionEndIndex, charset);
 
 
     int urlStartIndex = descriptionEndIndex + delimiterLength(encoding);
     int urlStartIndex = descriptionEndIndex + delimiterLength(encoding);
@@ -571,11 +569,11 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
     String mimeType = new String(data, 0, mimeTypeEndIndex, "ISO-8859-1");
     String mimeType = new String(data, 0, mimeTypeEndIndex, "ISO-8859-1");
 
 
     int filenameStartIndex = mimeTypeEndIndex + 1;
     int filenameStartIndex = mimeTypeEndIndex + 1;
-    int filenameEndIndex = indexOfEos(data, filenameStartIndex, encoding);
+    int filenameEndIndex = indexOfTerminator(data, filenameStartIndex, encoding);
     String filename = decodeStringIfValid(data, filenameStartIndex, filenameEndIndex, charset);
     String filename = decodeStringIfValid(data, filenameStartIndex, filenameEndIndex, charset);
 
 
     int descriptionStartIndex = filenameEndIndex + delimiterLength(encoding);
     int descriptionStartIndex = filenameEndIndex + delimiterLength(encoding);
-    int descriptionEndIndex = indexOfEos(data, descriptionStartIndex, encoding);
+    int descriptionEndIndex = indexOfTerminator(data, descriptionStartIndex, encoding);
     String description =
     String description =
         decodeStringIfValid(data, descriptionStartIndex, descriptionEndIndex, charset);
         decodeStringIfValid(data, descriptionStartIndex, descriptionEndIndex, charset);
 
 
@@ -613,7 +611,7 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
     int pictureType = data[mimeTypeEndIndex + 1] & 0xFF;
     int pictureType = data[mimeTypeEndIndex + 1] & 0xFF;
 
 
     int descriptionStartIndex = mimeTypeEndIndex + 2;
     int descriptionStartIndex = mimeTypeEndIndex + 2;
-    int descriptionEndIndex = indexOfEos(data, descriptionStartIndex, encoding);
+    int descriptionEndIndex = indexOfTerminator(data, descriptionStartIndex, encoding);
     String description =
     String description =
         new String(
         new String(
             data, descriptionStartIndex, descriptionEndIndex - descriptionStartIndex, charset);
             data, descriptionStartIndex, descriptionEndIndex - descriptionStartIndex, charset);
@@ -642,11 +640,11 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
     data = new byte[frameSize - 4];
     data = new byte[frameSize - 4];
     id3Data.readBytes(data, 0, frameSize - 4);
     id3Data.readBytes(data, 0, frameSize - 4);
 
 
-    int descriptionEndIndex = indexOfEos(data, 0, encoding);
+    int descriptionEndIndex = indexOfTerminator(data, 0, encoding);
     String description = new String(data, 0, descriptionEndIndex, charset);
     String description = new String(data, 0, descriptionEndIndex, charset);
 
 
     int textStartIndex = descriptionEndIndex + delimiterLength(encoding);
     int textStartIndex = descriptionEndIndex + delimiterLength(encoding);
-    int textEndIndex = indexOfEos(data, textStartIndex, encoding);
+    int textEndIndex = indexOfTerminator(data, textStartIndex, encoding);
     String text = decodeStringIfValid(data, textStartIndex, textEndIndex, charset);
     String text = decodeStringIfValid(data, textStartIndex, textEndIndex, charset);
 
 
     return new CommentFrame(language, description, text);
     return new CommentFrame(language, description, text);
@@ -823,7 +821,7 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
         : String.format(Locale.US, "%c%c%c%c", frameId0, frameId1, frameId2, frameId3);
         : String.format(Locale.US, "%c%c%c%c", frameId0, frameId1, frameId2, frameId3);
   }
   }
 
 
-  private static int indexOfEos(byte[] data, int fromIndex, int encoding) {
+  private static int indexOfTerminator(byte[] data, int fromIndex, int encoding) {
     int terminationPos = indexOfZeroByte(data, fromIndex);
     int terminationPos = indexOfZeroByte(data, fromIndex);
 
 
     // For single byte encoding charsets, we're done.
     // For single byte encoding charsets, we're done.