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

Don't abbreviate String as Str

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=126792706
This commit is contained in:
olly 2016-07-07 04:24:28 -07:00 committed by Oliver Woodman
parent 85741ff2d3
commit 8c0e0b690e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlParser.java
View File

@ -166,15 +166,15 @@ public final class TtmlParser extends SimpleSubtitleParser {
private FrameAndTickRate parseFrameAndTickRates(XmlPullParser xmlParser) throws ParserException {
int frameRate = DEFAULT_FRAME_RATE;
String frameRateStr = xmlParser.getAttributeValue(TTP, "frameRate");
if (frameRateStr != null) {
frameRate = Integer.parseInt(frameRateStr);
String frameRateString = xmlParser.getAttributeValue(TTP, "frameRate");
if (frameRateString != null) {
frameRate = Integer.parseInt(frameRateString);
}
float frameRateMultiplier = 1;
String frameRateMultiplierStr = xmlParser.getAttributeValue(TTP, "frameRateMultiplier");
if (frameRateMultiplierStr != null) {
String[] parts = frameRateMultiplierStr.split(" ");
String frameRateMultiplierString = xmlParser.getAttributeValue(TTP, "frameRateMultiplier");
if (frameRateMultiplierString != null) {
String[] parts = frameRateMultiplierString.split(" ");
if (parts.length != 2) {
throw new ParserException("frameRateMultiplier doesn't have 2 parts");
}
@ -184,15 +184,15 @@ public final class TtmlParser extends SimpleSubtitleParser {
}
int subFrameRate = DEFAULT_FRAME_AND_TICK_RATE.subFrameRate;
String subFrameRateStr = xmlParser.getAttributeValue(TTP, "subFrameRate");
if (subFrameRateStr != null) {
subFrameRate = Integer.parseInt(subFrameRateStr);
String subFrameRateString = xmlParser.getAttributeValue(TTP, "subFrameRate");
if (subFrameRateString != null) {
subFrameRate = Integer.parseInt(subFrameRateString);
}
int tickRate = DEFAULT_FRAME_AND_TICK_RATE.tickRate;
String tickRateStr = xmlParser.getAttributeValue(TTP, "tickRate");
if (tickRateStr != null) {
tickRate = Integer.parseInt(tickRateStr);
String tickRateString = xmlParser.getAttributeValue(TTP, "tickRate");
if (tickRateString != null) {
tickRate = Integer.parseInt(tickRateString);
}
return new FrameAndTickRate(frameRate * frameRateMultiplier, subFrameRate, tickRate);
}