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

Merged
peerless2012 merged 3 commits into from
Oct 26, 2026
Merged

Don't assume particuliar order of AttachedFile segment #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b69689
Don't assume particuliar order of AttachedFile segment
moi15moi Oct 24, 2026
0eb87e1
Support font attachment with the "application/octet-stream"
moi15moi Oct 24, 2026
b87b91e
Detect more font mime type
moi15moi Oct 24, 2026
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
34 changes: 23 additions & 11 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 @@ -21,6 +21,7 @@ open 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 @@ -66,7 +67,20 @@ open 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)

// Detect fonts like the spec says: https://github.com/ietf-wg-cellar/matroska-specification/blob/1a943ead9bb4c67b02b966cebafe51c8c074e703/cellar-matroska/attachments.md?plain=1#L87-L111
val isFont = attachmentMime in fontMimeTypes ||
(attachmentMime == "application/octet-stream" &&
fontExtensions.any { attachmentName.lowercase().endsWith(it) })
if (isFont) {
assHandler.addFont(attachmentName, attachmentData)
}
clearAttachment()
}
else -> super.endMasterElement(id)
}
}
Expand All @@ -82,16 +96,8 @@ open class AssMatroskaExtractor(
override fun binaryElement(id: Int, contentSize: Int, input: ExtractorInput) {
when (id) {
ID_FILE_DATA -> {
val attachmentName = requireNotNull(currentAttachmentName)
val attachmentMime = requireNotNull(currentAttachmentMime)

if (attachmentMime in fontMimeTypes) {
val data = ByteArray(contentSize)
input.readFully(data, 0, contentSize)
assHandler.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 +106,7 @@ open class AssMatroskaExtractor(
private fun clearAttachment() {
currentAttachmentName = null
currentAttachmentMime = null
currentAttachmentData = null
}

companion object {
Expand All @@ -112,6 +119,7 @@ open class AssMatroskaExtractor(
const val ID_FILE_DATA = 0x465C

val fontMimeTypes = listOf(
"font/collection",
"font/ttf",
"font/otf",
"font/sfnt",
Expand All @@ -121,9 +129,13 @@ open class AssMatroskaExtractor(
"application/font-woff",
"application/x-truetype-font",
"application/vnd.ms-opentype",
"application/x-font",
"application/x-font-ttf",
"application/x-font-otf",
)

val fontExtensions = listOf(".ttf", ".otf", ".ttc", ".otc")

val extractorOutput = MatroskaExtractor::class.java.getDeclaredField("extractorOutput").apply {
isAccessible = true
}
Expand Down
Loading