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

Simplified class fields and method parameters due to using ArrayList

Browse source
This commit is contained in:
microkatz 2023-10-02 09:54:43 +00:00
parent 34a0e3fa09
commit cd29d4637d
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/UrlTemplate.java
View file

@ -43,7 +43,6 @@ public final class UrlTemplate {
private final List<String> urlPieces; private final List<String> urlPieces;
private final List<Integer> identifiers; private final List<Integer> identifiers;
private final List<String> identifierFormatTags; private final List<String> identifierFormatTags;
private final int identifierCount;
/** /**
* Compile an instance from the provided template string. * Compile an instance from the provided template string.
@ -57,20 +56,16 @@ public final class UrlTemplate {
List<Integer> identifiers = new ArrayList<>(); List<Integer> identifiers = new ArrayList<>();
List<String> identifierFormatTags = new ArrayList<>(); List<String> identifierFormatTags = new ArrayList<>();
int identifierCount = parseTemplate(template, urlPieces, identifiers, identifierFormatTags); parseTemplate(template, urlPieces, identifiers, identifierFormatTags);
return new UrlTemplate(urlPieces, identifiers, identifierFormatTags, identifierCount); return new UrlTemplate(urlPieces, identifiers, identifierFormatTags);
} }
/** Internal constructor. Use {@link #compile(String)} to build instances of this class. */ /** Internal constructor. Use {@link #compile(String)} to build instances of this class. */
private UrlTemplate( private UrlTemplate(
List<String> urlPieces, List<String> urlPieces, List<Integer> identifiers, List<String> identifierFormatTags) {
List<Integer> identifiers,
List<String> identifierFormatTags,
int identifierCount) {
this.urlPieces = urlPieces; this.urlPieces = urlPieces;
this.identifiers = identifiers; this.identifiers = identifiers;
this.identifierFormatTags = identifierFormatTags; this.identifierFormatTags = identifierFormatTags;
this.identifierCount = identifierCount;
} }
/** /**
@ -86,7 +81,7 @@ public final class UrlTemplate {
*/ */
public String buildUri(String representationId, long segmentNumber, int bandwidth, long time) { public String buildUri(String representationId, long segmentNumber, int bandwidth, long time) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (int i = 0; i < identifierCount; i++) { for (int i = 0; i < identifiers.size(); i++) {
builder.append(urlPieces.get(i)); builder.append(urlPieces.get(i));
if (identifiers.get(i) == REPRESENTATION_ID) { if (identifiers.get(i) == REPRESENTATION_ID) {
builder.append(representationId); builder.append(representationId);
@ -98,12 +93,12 @@ public final class UrlTemplate {
builder.append(String.format(Locale.US, identifierFormatTags.get(i), time)); builder.append(String.format(Locale.US, identifierFormatTags.get(i), time));
} }
} }
builder.append(urlPieces.get(identifierCount)); builder.append(urlPieces.get(identifiers.size()));
return builder.toString(); return builder.toString();
} }
/** /**
* Parses {@code template}, placing the decomposed components into the provided arrays. * Parses {@code template}, placing the decomposed components into the provided lists.
* *
* <p>If the return value is N, {@code urlPieces} will contain (N+1) strings that must be * <p>If the return value is N, {@code urlPieces} will contain (N+1) strings that must be
* interleaved with N arguments in order to construct a url. The N identifiers that correspond to * interleaved with N arguments in order to construct a url. The N identifiers that correspond to
@ -114,30 +109,28 @@ public final class UrlTemplate {
* @param urlPieces A holder for pieces of url parsed from the template. * @param urlPieces A holder for pieces of url parsed from the template.
* @param identifiers A holder for identifiers parsed from the template. * @param identifiers A holder for identifiers parsed from the template.
* @param identifierFormatTags A holder for format tags corresponding to the parsed identifiers. * @param identifierFormatTags A holder for format tags corresponding to the parsed identifiers.
* @return The number of identifiers in the template url.
* @throws IllegalArgumentException If the template string is malformed. * @throws IllegalArgumentException If the template string is malformed.
*/ */
private static int parseTemplate( private static void parseTemplate(
String template, String template,
List<String> urlPieces, List<String> urlPieces,
List<Integer> identifiers, List<Integer> identifiers,
List<String> identifierFormatTags) { List<String> identifierFormatTags) {
urlPieces.add(""); urlPieces.add("");
int templateIndex = 0; int templateIndex = 0;
int identifierCount = 0;
while (templateIndex < template.length()) { while (templateIndex < template.length()) {
int dollarIndex = template.indexOf("$", templateIndex); int dollarIndex = template.indexOf("$", templateIndex);
if (dollarIndex == -1) { if (dollarIndex == -1) {
urlPieces.set( urlPieces.set(
identifierCount, urlPieces.get(identifierCount) + template.substring(templateIndex)); identifiers.size(), urlPieces.get(identifiers.size()) + template.substring(templateIndex));
templateIndex = template.length(); templateIndex = template.length();
} else if (dollarIndex != templateIndex) { } else if (dollarIndex != templateIndex) {
urlPieces.set( urlPieces.set(
identifierCount, identifiers.size(),
urlPieces.get(identifierCount) + template.substring(templateIndex, dollarIndex)); urlPieces.get(identifiers.size()) + template.substring(templateIndex, dollarIndex));
templateIndex = dollarIndex; templateIndex = dollarIndex;
} else if (template.startsWith(ESCAPED_DOLLAR, templateIndex)) { } else if (template.startsWith(ESCAPED_DOLLAR, templateIndex)) {
urlPieces.set(identifierCount, urlPieces.get(identifierCount) + "$"); urlPieces.set(identifiers.size(), urlPieces.get(identifiers.size()) + "$");
templateIndex += 2; templateIndex += 2;
} else { } else {
identifierFormatTags.add(""); identifierFormatTags.add("");
@ -171,13 +164,11 @@ public final class UrlTemplate {
default: default:
throw new IllegalArgumentException("Invalid template: " + template); throw new IllegalArgumentException("Invalid template: " + template);
} }
identifierFormatTags.set(identifierCount, formatTag); identifierFormatTags.set(identifiers.size() - 1, formatTag);
} }
identifierCount++;
urlPieces.add(""); urlPieces.add("");
templateIndex = secondIndex + 1; templateIndex = secondIndex + 1;
} }
} }
return identifierCount;
} }
} }