Skip to content

Rewrite TTML parser and B24 converter #55

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
nekohkr merged 12 commits into from
Aug 21, 2026
Merged

Rewrite TTML parser and B24 converter #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4b71026
Fix reading aggregated signaling messages from wrong stream
nekohkr Jul 5, 2026
91b0487
Rewrite TTML parser and B24 converter
nekohkr Aug 13, 2026
851b576
Improve ARIB-TTML compliance
Aug 18, 2026
ed44f93
Improve ARIB caption encoding compatibility
Aug 18, 2026
8eaab44
Fix build error
Aug 18, 2026
9743e64
Fix build error
Aug 18, 2026
2d113d3
Fix build error
Aug 19, 2026
04625ea
Use AdditionalAribSubtitleInfo for subtitle signaling
nekohkr Aug 19, 2026
6e963ac
Improve ARIB caption encoding compatibility
Aug 20, 2026
3fa608f
Merge branch 'main' into ttml
nekohkr Aug 20, 2026
ae474e8
Improve ARIB caption encoding compatibility
Aug 20, 2026
0c5e4a8
Clamp subtitle PTS
Aug 21, 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
80 changes: 41 additions & 39 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
PROJECT_NAME = dantto4k

SRC_DIR = src
OBJ_DIR = build

SRC_FILES = $(filter-out $(SRC_DIR)/bonTuner.cpp $(SRC_DIR)/dllmain.cpp, $(wildcard $(SRC_DIR)/*.cpp))

OBJ_FILES = $(SRC_FILES:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)

TSDUCK_INC = $(shell pkg-config --cflags-only-I tsduck)
TSDUCK_LIB = $(shell pkg-config --libs tsduck)

PCSC_INC = $(shell pkg-config --cflags-only-I libpcsclite)
PCSC_LIB = $(shell pkg-config --libs libpcsclite)

CXX = g++
CXXFLAGS = -std=c++20 -Wall -maes -msse4.1 $(TSDUCK_INC) $(PCSC_INC) -Ithirdparty/asio/asio/include
LDFLAGS = $(TSDUCK_LIB) $(PCSC_LIB)

EXEC = $(OBJ_DIR)/$(PROJECT_NAME)

all: $(EXEC)

$(OBJ_DIR):
mkdir -p $(OBJ_DIR)

$(EXEC): $(OBJ_FILES)
$(CXX) $(OBJ_FILES) $(LDFLAGS) -o $(EXEC)

$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp | $(OBJ_DIR)
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
rm -rf $(OBJ_DIR)

install:
cp $(EXEC) /usr/local/bin/$(PROJECT_NAME)

.PHONY: all clean install
PROJECT_NAME = dantto4k

SRC_DIR = src
OBJ_DIR = build

SRC_FILES = $(filter-out $(SRC_DIR)/bonTuner.cpp $(SRC_DIR)/dllmain.cpp, \
$(wildcard $(SRC_DIR)/*.cpp) $(wildcard $(SRC_DIR)/ttml/*.cpp))

OBJ_FILES = $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRC_FILES))

TSDUCK_INC = $(shell pkg-config --cflags-only-I tsduck)
TSDUCK_LIB = $(shell pkg-config --libs tsduck)

PCSC_INC = $(shell pkg-config --cflags-only-I libpcsclite)
PCSC_LIB = $(shell pkg-config --libs libpcsclite)

CXX = g++
CXXFLAGS = -std=c++20 -Wall -maes -msse4.1 $(TSDUCK_INC) $(PCSC_INC) -I$(SRC_DIR) -Ithirdparty/asio/asio/include
LDFLAGS = $(TSDUCK_LIB) $(PCSC_LIB)

EXEC = $(OBJ_DIR)/$(PROJECT_NAME)

all: $(EXEC)

$(OBJ_DIR):
mkdir -p $(OBJ_DIR)

$(EXEC): $(OBJ_FILES)
$(CXX) $(OBJ_FILES) $(LDFLAGS) -o $(EXEC)

$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp | $(OBJ_DIR)
mkdir -p $(dir $@)
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
rm -rf $(OBJ_DIR)

install:
cp $(EXEC) /usr/local/bin/$(PROJECT_NAME)

.PHONY: all clean install
100 changes: 58 additions & 42 deletions msvc/dantto4k.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand All @@ -67,19 +67,19 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="dantto4k-static-tsduck.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(Platform)\$(Configuration)\dantto4k\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(Platform)\$(Configuration)\dantto4k\</IntDir>
</PropertyGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="dantto4k-static-tsduck.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(Platform)\$(Configuration)\dantto4k\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(Platform)\$(Configuration)\dantto4k\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down Expand Up @@ -112,38 +112,40 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;TSDUCK_STATIC_LIBRARY;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;TSDUCK_STATIC_LIBRARY;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;TSDUCK_STATIC_LIBRARY;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;TSDUCK_STATIC_LIBRARY;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="../src/accessControlDescriptor.cpp" />
<ClCompile Include="../src/aes.cpp" />
Expand All @@ -165,7 +167,8 @@
<ClCompile Include="../src/acasCard.cpp" />
<ClCompile Include="../src/adtsConverter.cpp" />
<ClCompile Include="../src/b24Color.cpp" />
<ClCompile Include="../src/b24SubtitleConvertor.cpp" />
<ClCompile Include="..\src\additionalAribSubtitleInfo.cpp" />
<ClCompile Include="..\src\b24SubtitleConverter.cpp" />
<ClCompile Include="../src/bonTuner.cpp" />
<ClCompile Include="../src/caMessage.cpp" />
<ClCompile Include="../src/casProxyClient.cpp" />
Expand All @@ -189,7 +192,8 @@
<ClCompile Include="../src/mmtDescriptorFactory.cpp" />
<ClCompile Include="../src/mmtTableFactory.cpp" />
<ClCompile Include="../src/multimediaServiceInformationDescriptor.cpp" />
<ClCompile Include="../src/ntp.cpp" />
<ClCompile Include="../src/ntp.cpp" />
<ClCompile Include="../src/ntpTimestamp.cpp" />
<ClCompile Include="../src/pesPacket.cpp" />
<ClCompile Include="../src/pugixml.cpp" />
<ClCompile Include="../src/relatedBroadcasterDescriptor.cpp" />
Expand All @@ -198,7 +202,6 @@
<ClCompile Include="../src/timeUtil.cpp" />
<ClCompile Include="../src/tlvDescriptorFactory.cpp" />
<ClCompile Include="../src/tlvTableFactory.cpp" />
<ClCompile Include="../src/ttml.cpp" />
<ClCompile Include="../src/mpuVideoProcessor.cpp" />
<ClCompile Include="../src/m2SectionMessage.cpp" />
<ClCompile Include="../src/m2ShortSectionMessage.cpp" />
Expand Down Expand Up @@ -248,6 +251,10 @@
<ClCompile Include="../src/videoComponentDescriptor.cpp" />
<ClCompile Include="../src/aribCharsetTables.cpp" />
<ClCompile Include="../src/aribCharsetEncoder.cpp" />
<ClCompile Include="..\src\ttml\b24_converter.cpp" />
<ClCompile Include="..\src\ttml\parser.cpp" />
<ClCompile Include="..\src\ttml\resolver.cpp" />
<ClCompile Include="..\src\ttml\style.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="../src/accessControlDescriptor.h" />
Expand All @@ -271,7 +278,8 @@
<ClInclude Include="../src/adtsConverter.h" />
<ClInclude Include="../src/b24Color.h" />
<ClInclude Include="../src/b24ControlSet.h" />
<ClInclude Include="../src/b24SubtitleConvertor.h" />
<ClInclude Include="..\src\additionalAribSubtitleInfo.h" />
<ClInclude Include="..\src\b24SubtitleConverter.h" />
<ClInclude Include="../src/bonDriverContext.h" />
<ClInclude Include="../src/bonTuner.h" />
<ClInclude Include="../src/caMessage.h" />
Expand Down Expand Up @@ -301,7 +309,8 @@
<ClInclude Include="../src/mmtTableFactory.h" />
<ClInclude Include="../src/mmtTlvStatistics.h" />
<ClInclude Include="../src/multimediaServiceInformationDescriptor.h" />
<ClInclude Include="../src/ntp.h" />
<ClInclude Include="../src/ntp.h" />
<ClInclude Include="../src/ntpTimestamp.h" />
<ClInclude Include="../src/pesPacket.h" />
<ClInclude Include="../src/pugiconfig.hpp" />
<ClInclude Include="../src/pugixml.hpp" />
Expand All @@ -311,7 +320,6 @@
<ClInclude Include="../src/timeUtil.h" />
<ClInclude Include="../src/tlvDescriptorFactory.h" />
<ClInclude Include="../src/tlvTableFactory.h" />
<ClInclude Include="../src/ttml.h" />
<ClInclude Include="../src/mpuVideoProcessor.h" />
<ClInclude Include="../src/IBonDriver.h" />
<ClInclude Include="../src/ip.h" />
Expand Down Expand Up @@ -372,8 +380,16 @@
<ClInclude Include="../src/aribCharsetEncoder.h" />
<ClInclude Include="../src/progressReporter.h" />
<ClInclude Include="../src/sha256.h" />
<ClInclude Include="..\src\ttml\ast.h" />
<ClInclude Include="..\src\ttml\b24_converter.h" />
<ClInclude Include="..\src\ttml\parser.h" />
<ClInclude Include="..\src\ttml\resolved.h" />
<ClInclude Include="..\src\ttml\resolver.h" />
<ClInclude Include="..\src\ttml\style.h" />
<ClInclude Include="..\src\ttml\string_utils.h" />
<ClInclude Include="..\src\ttml\sync_mode.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Loading
Loading