Skip to content

Fix multi ass with legacy mode #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peerless2012 merged 3 commits into from
Apr 8, 2025
Merged

Fix multi ass with legacy mode #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d306e97
Add androidx annotation and experimental.
peerless2012 Apr 8, 2025
1ea6ddc
Fix none selected track lost event for mkv with multi ass tracks.
peerless2012 Apr 8, 2025
99a4926
Update version to 0.2.2
peerless2012 Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android.nonTransitiveRClass=true

# maven publish
GROUP=io.github.peerless2012
VERSION_NAME=0.2.1
VERSION_NAME=0.2.2

POM_URL=https://github.com/peerless2012/libass-android
POM_INCEPTION_YEAR=2025
Expand Down
4 changes: 4 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
agp = "8.7.3"
kotlin = "1.9.24"
coreKtx = "1.15.0"
annotation = "1.9.1"
annotation-experimental = "1.4.1"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
Expand All @@ -14,6 +16,8 @@ publish = "0.30.0"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "annotation"}
androidx-annotation-experimental = { group = "androidx.annotation", name = "annotation-experimental", version.ref = "annotation-experimental"}
junit = { group = "junit", name = "junit", version.ref = "junit" }
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
Expand Down
2 changes: 2 additions & 0 deletions lib_ass_media/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ android {
}

dependencies {
implementation(libs.androidx.annotation)
implementation(libs.androidx.annotation.experimental)
implementation(libs.androidx.media3.exo)
implementation(libs.androidx.media3.ui)
implementation(libs.androidx.media3.effect)
Expand Down
3 changes: 3 additions & 0 deletions ...s_media/src/main/java/io/github/peerless2012/ass/media/parser/AssSegmentSubtitleParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class AssSegmentSubtitleParser(
private val timestampPattern = "(\\d+:\\d{2}:\\d{2}):(\\d{2})".toRegex()

override fun onParse(data: ByteArray, offset: Int, length: Int) {
// when mkv has multi ass track, this parser will be called for each track.
assHandler.render?.setTrack(track)

// Note
// Exoplayer will trans time from hh:mm:ss.xxx to hh:mm:ss:xxx
// And lib ass only can parse hh:mm:ss.xxx
Expand Down