Skip to content

Don't assume particuliar order of AttachedFile segment #24

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

Open
moi15moi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't assume particuliar order of AttachedFile segment #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions ...ss_media/src/main/java/io/github/peerless2012/ass/media/extractor/AssMatroskaExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class AssMatroskaExtractor(

private var currentAttachmentName: String? = null
private var currentAttachmentMime: String? = null
private var currentAttachmentData: ByteArray? = null

internal val subtitleSample = subtitleSampleField.get(this) as ParsableByteArray

Expand Down Expand Up @@ -65,7 +66,17 @@ class AssMatroskaExtractor(
assHandler.setVideoSize(track.width, track.height)
super.endMasterElement(id)
}
ID_ATTACHED_FILE -> clearAttachment()
ID_ATTACHED_FILE -> {
val attachmentName = requireNotNull(currentAttachmentName)
val attachmentMime = requireNotNull(currentAttachmentMime)
val attachmentData = requireNotNull(currentAttachmentData)

// Only add fonts if an ASS track was detected to support lazy initialization
if (assHandler.hasTracks() && attachmentMime in fontMimeTypes) {
assHandler.ass.addFont(attachmentName, attachmentData)
}
clearAttachment()
}
else -> super.endMasterElement(id)
}
}
Expand All @@ -81,17 +92,8 @@ class AssMatroskaExtractor(
override fun binaryElement(id: Int, contentSize: Int, input: ExtractorInput) {
when (id) {
ID_FILE_DATA -> {
val attachmentName = requireNotNull(currentAttachmentName)
val attachmentMime = requireNotNull(currentAttachmentMime)

// Only add fonts if an ASS track was detected to support lazy initialization
if (assHandler.hasTracks() && attachmentMime in fontMimeTypes) {
val data = ByteArray(contentSize)
input.readFully(data, 0, contentSize)
assHandler.ass.addFont(attachmentName, data)
} else {
input.skipFully(contentSize)
}
currentAttachmentData = ByteArray(contentSize)
input.readFully(currentAttachmentData!!, 0, contentSize)
}
else -> super.binaryElement(id, contentSize, input)
}
Expand All @@ -100,6 +102,7 @@ class AssMatroskaExtractor(
private fun clearAttachment() {
currentAttachmentName = null
currentAttachmentMime = null
currentAttachmentData = null
}

companion object {
Expand Down