Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4d6d8060
authored
Oct 30, 2019
by
Arnold Szabo
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Use PointF instead of Pair when parsing the position
parent
0391e73a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
Project Default.xml
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
Project Default.xml
0 → 100644
View file @
4d6d8060
<component
name=
"InspectionProjectProfileManager"
>
<profile
version=
"1.0"
>
<option
name=
"myName"
value=
"Project Default"
/>
</profile>
</component>
\ No newline at end of file
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
View file @
4d6d8060
...
...
@@ -15,8 +15,8 @@
*/
package
com
.
google
.
android
.
exoplayer2
.
text
.
ssa
;
import
android.graphics.PointF
;
import
android.text.TextUtils
;
import
android.util.Pair
;
import
androidx.annotation.Nullable
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.text.Cue
;
...
...
@@ -205,7 +205,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
}
// Parse \pos{x,y} attribute
P
air
<
Float
,
Float
>
position
=
parsePosition
(
lineValues
[
formatTextIndex
]);
P
ointF
position
=
parsePosition
(
lineValues
[
formatTextIndex
]);
String
text
=
lineValues
[
formatTextIndex
]
.
replaceAll
(
"\\{.*?\\}"
,
""
)
...
...
@@ -217,10 +217,10 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
cue
=
new
Cue
(
text
,
/* textAlignment */
null
,
position
.
second
/
playResY
,
position
.
y
/
playResY
,
Cue
.
LINE_TYPE_FRACTION
,
Cue
.
ANCHOR_TYPE_START
,
position
.
first
/
playResX
,
position
.
x
/
playResX
,
Cue
.
ANCHOR_TYPE_MIDDLE
,
Cue
.
DIMEN_UNSET
);
}
else
{
...
...
@@ -286,14 +286,14 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
}
@Nullable
public
static
P
air
<
Float
,
Float
>
parsePosition
(
String
line
){
public
static
P
ointF
parsePosition
(
String
line
){
Matcher
matcher
=
SSA_POSITION_PATTERN
.
matcher
(
line
);
if
(!
matcher
.
find
()){
return
null
;
}
float
x
=
Float
.
parseFloat
(
matcher
.
group
(
1
));
float
y
=
Float
.
parseFloat
(
matcher
.
group
(
3
));
return
new
P
air
<>(
x
,
y
);
return
new
P
ointF
(
x
,
y
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment