Commit 4d6d8060 by Arnold Szabo

Use PointF instead of Pair when parsing the position

parent 0391e73a
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
</profile>
</component>
\ No newline at end of file
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
*/ */
package com.google.android.exoplayer2.text.ssa; package com.google.android.exoplayer2.text.ssa;
import android.graphics.PointF;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Cue;
...@@ -205,7 +205,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder { ...@@ -205,7 +205,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
} }
// Parse \pos{x,y} attribute // Parse \pos{x,y} attribute
Pair<Float, Float> position = parsePosition(lineValues[formatTextIndex]); PointF position = parsePosition(lineValues[formatTextIndex]);
String text = lineValues[formatTextIndex] String text = lineValues[formatTextIndex]
.replaceAll("\\{.*?\\}", "") .replaceAll("\\{.*?\\}", "")
...@@ -217,10 +217,10 @@ public final class SsaDecoder extends SimpleSubtitleDecoder { ...@@ -217,10 +217,10 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
cue = new Cue( cue = new Cue(
text, text,
/* textAlignment */ null, /* textAlignment */ null,
position.second / playResY, position.y / playResY,
Cue.LINE_TYPE_FRACTION, Cue.LINE_TYPE_FRACTION,
Cue.ANCHOR_TYPE_START, Cue.ANCHOR_TYPE_START,
position.first / playResX, position.x / playResX,
Cue.ANCHOR_TYPE_MIDDLE, Cue.ANCHOR_TYPE_MIDDLE,
Cue.DIMEN_UNSET); Cue.DIMEN_UNSET);
} else { } else {
...@@ -286,14 +286,14 @@ public final class SsaDecoder extends SimpleSubtitleDecoder { ...@@ -286,14 +286,14 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
} }
@Nullable @Nullable
public static Pair<Float, Float> parsePosition(String line){ public static PointF parsePosition(String line){
Matcher matcher = SSA_POSITION_PATTERN.matcher(line); Matcher matcher = SSA_POSITION_PATTERN.matcher(line);
if(!matcher.find()){ if(!matcher.find()){
return null; return null;
} }
float x = Float.parseFloat(matcher.group(1)); float x = Float.parseFloat(matcher.group(1));
float y = Float.parseFloat(matcher.group(3)); float y = Float.parseFloat(matcher.group(3));
return new Pair<>(x,y); return new PointF(x, y);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment