Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
61c507c
Replace Haali parser with libmatroska
Aug 27, 2026
2ab0a81
Refactor libmatroska adapter for readability
Aug 27, 2026
3199c55
Add proposed native Matroska interface
Aug 27, 2026
b30e682
Promote native Matroska interface
Aug 27, 2026
5a8821e
Fix native Matroska Meson integration
Aug 27, 2026
e8077c8
Use WrapDB for native Matroska fallbacks
Aug 27, 2026
411492d
Clarify Matroska behavior test purpose
Aug 27, 2026
68cbbff
Remove legacy Haali Matroska parser
Aug 27, 2026
dd7800f
Clean up Matroska test sources in Meson
Aug 28, 2026
b7ece55
Avoid parent paths in Matroska test includes
Sep 1, 2026
b83e584
Consolidate Matroska Meson dependency
Sep 1, 2026
03d00cd
Explain Matroska unity override
Sep 2, 2026
2352669
Shorten Matroska unity comment
Sep 2, 2026
846c678
Align Matroska behavior target arguments
Sep 2, 2026
dbe9b11
Format Matroska behavior target multiline
Sep 2, 2026
4da8476
Fix Matroska streaming and import regressions
Sep 2, 2026
9e20cdf
Remove the Haali compatibility layer from the Matroska demuxer
CoffeeFlux Oct 7, 2026
c0c2969
Fix Matroska subtitle import cancellation and error handling
CoffeeFlux Oct 7, 2026
20bed13
Fix Matroska demuxer regressions relative to the Haali parser
CoffeeFlux Oct 7, 2026
cf3662e
Match the Haali parser's Matroska timestamp handling
CoffeeFlux Oct 7, 2026
36344ba
Read Matroska metadata without walking every cluster
CoffeeFlux Oct 7, 2026
9c3c1b6
Keep Matroska test expectations LF on Windows
CoffeeFlux Oct 7, 2026
ec571ff
Make imported Matroska subtitles relative to the start of the file
CoffeeFlux Oct 7, 2026
49da71e
Read partially downloaded Matroska files and late segment info
CoffeeFlux Oct 7, 2026
56780aa
Bound Matroska cluster parsing memory and fix libebml fallback
CoffeeFlux Oct 7, 2026
196fde4
Apply TrackTimecodeScale only to block-relative timestamps
CoffeeFlux Oct 7, 2026
6d2e8af
Require the libebml and libmatroska versions that are bundled
CoffeeFlux Oct 8, 2026
4d10c14
Add the Matroska library to deps
CoffeeFlux Oct 8, 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
6 changes: 0 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true

[src/MatroskaParser.{c,h}]
indent_style = tab
indent_size = 2
tab_width = 8
trim_trailing_whitespace = false

[src/libresrc/**default_*.json]
indent_style = tab
indent_size = 2
Expand Down
6 changes: 4 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ subprojects/csri/meson.build -linguist-vendored
subprojects/iconv/meson.build -linguist-vendored
subprojects/luabins/meson.build -linguist-vendored

src/MatroskaParser.* linguist-vendored

libaegisub/lua/modules/lpeg.* linguist-vendored

automation/include/moonscript.lua linguist-vendored

# Compared byte-for-byte by the Matroska tests
tests/matroska/fixtures/*.behavior eol=lf
tests/matroska/fixtures/*.mk[av] binary
3 changes: 0 additions & 3 deletions LICENCE
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ follows:
src/gl/
- MIT license. See src/gl/glext.h

src/MatroskaParser.(c|h)
- Licensed to BSDL with permission from the author.

universalchardet/
- MPL 1.1

3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ endif

zlib_dep = dependency('zlib')
deps += zlib_dep
# The bundled libmatroska needs libebml >= 1.4.4
libebml = dependency('libebml', version: '>=1.4.4', fallback: ['libebml', 'libebml_dep'])
libmatroska = dependency('libmatroska', version: '>=1.7.1', fallback: ['libmatroska', 'libmatroska_dep'])

use_bundled_wx = force_all_fallbacks or force_fallback_for.contains('wxWidgets')
if not use_bundled_wx
Expand Down
Loading
Loading