Smptett encoder

.github/workflows/build_linux.yml

@@ -27,6 +27,10 @@ jobs:
     steps:
     - name: Install dependencies
       run: sudo apt update && sudo apt-get install libgpac-dev libtesseract-dev libavcodec-dev libavdevice-dev libx11-dev libxcb1-dev libxcb-shm0-dev
+    - name: Install Rust
+      run: |
+        curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
     - uses: actions/checkout@v6
     - name: build
       run: ./build -hardsubx
@@ -47,6 +51,10 @@ jobs:
     steps:
     - name: Install dependencies
       run: sudo apt update && sudo apt-get install libgpac-dev
+    - name: Install Rust
+      run: |
+        curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
     - uses: actions/checkout@v6
     - name: run autogen
       run: ./autogen.sh
@@ -65,6 +73,10 @@ jobs:
     steps:
     - name: Install dependencies
       run: sudo apt update && sudo apt-get install libgpac-dev
+    - name: Install Rust
+      run: |
+        curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
     - uses: actions/checkout@v6
     - name: cmake
       run: mkdir build && cd build && cmake ../src
@@ -79,8 +91,13 @@ jobs:
     - uses: actions/checkout@v6
     - name: Install dependencies
       run: sudo apt update && sudo apt install libgpac-dev libtesseract-dev libavformat-dev libavdevice-dev libswscale-dev yasm
+    - name: Install Rust
+      run: |
+        curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
     - name: cmake
       run: |
+
         mkdir build && cd build
         cmake -DWITH_OCR=ON -DWITH_HARDSUBX=ON ../src
     - name: build
@@ -94,6 +111,10 @@ jobs:
     steps:
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install libgpac-dev
+    - name: Install Rust
+      run: |
+        curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
       - uses: actions/checkout@v6
       - name: cache 
         uses: actions/cache@v5

.github/workflows/build_mac.yml

@@ -64,6 +64,10 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v6
+    - name: Install Rust
+      run: |
+        curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+        echo "$HOME/.cargo/bin" >> $GITHUB_PATH
     - name: dependencies
       run: brew install gpac
     - uses: actions/checkout@v6
@@ -78,6 +82,10 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v6
+    - name: Install Rust
+      run: |
+        curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+        echo "$HOME/.cargo/bin" >> $GITHUB_PATH
     - name: Install dependencies
       run: brew install pkg-config autoconf automake libtool tesseract leptonica gpac ffmpeg
     - name: cmake

.gitignore

@@ -156,6 +156,21 @@ windows/*/CACHEDIR.TAG
 windows/.rustc_info.json
 linux/configure~
 
+# local junk
+build-system/
+*.backup
+*.save
+*.patch
+*.a
+README.srt
+no_subs.ts
+
+fix_hardsubx.cmake
+fix_libraries.cmake
+mac/configure~
+*.current
+
+
 # Plans and temporary files
 plans/
 tess.log

mac/build.command

@@ -106,7 +106,7 @@ if [[ "$ENABLE_OCR" == "true" ]]; then
     BLD_INCLUDE="$BLD_INCLUDE `pkg-config --cflags --silence-errors tesseract`"
 fi
 
-SRC_CCX="$(find ../src/lib_ccx -name '*.c')"
+SRC_CCX="$(find ../src/lib_ccx -name '*.c' | grep -v ccx_encoders_smptett.c)"
 SRC_LIB_HASH="$(find ../src/thirdparty/lib_hash -name '*.c')"
 SRC_LIBPNG="$(find ../src/thirdparty/libpng -name '*.c')"
 SRC_UTF8="../src/thirdparty/utf8proc/utf8proc.c"

src/CMakeLists.txt

@@ -246,11 +246,25 @@ add_executable (ccextractor ${SOURCEFILE} ${FREETYPE_SOURCE} ${UTF8PROC_SOURCE})
 # Build with Rust library
 ########################################################
 
-if (PKG_CONFIG_FOUND)
-  add_subdirectory (rust)
-  set (EXTRA_LIBS ${EXTRA_LIBS} ccx_rust)
-endif (PKG_CONFIG_FOUND)
+# Rust is REQUIRED for DTVCC and SMPTE-TT functionality
+find_program(CARGO cargo PATHS $ENV{HOME}/.cargo/bin REQUIRED)
+message(STATUS "Found cargo: ${CARGO}")
+
+# Build Rust library using Corrosion (in rust/CMakeLists.txt)
+add_subdirectory(rust)
+
+# Platform-specific system libraries needed for Rust
+if(APPLE)
+    set(RUST_EXTRA_LIBS pthread dl m "-framework Security" "-framework CoreFoundation")
+elseif(WIN32)
+    set(RUST_EXTRA_LIBS ws2_32 userenv bcrypt ntdll)
+else()
+    set(RUST_EXTRA_LIBS pthread dl m)
+endif()
 
+set(EXTRA_LIBS ${EXTRA_LIBS} ccx_rust ${RUST_EXTRA_LIBS})
+set(RUST_AVAILABLE TRUE)
+message(STATUS "Rust available, using Rust implementations")
 
 target_link_libraries (ccextractor ${EXTRA_LIBS})
 target_include_directories (ccextractor PUBLIC ${EXTRA_INCLUDES})

src/lib_ccx/CMakeLists.txt

@@ -59,6 +59,9 @@ endif (WITH_OCR)
 
 aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_ccx/" SOURCEFILE)
 
+# Rust is available, using Rust SMPTE-TT implementation
+list(REMOVE_ITEM SOURCEFILE "${PROJECT_SOURCE_DIR}/lib_ccx/ccx_encoders_smptett.c")
+
 add_library (ccx ${SOURCEFILE} ccx_dtvcc.h ccx_dtvcc.c ccx_encoders_mcc.c ccx_encoders_mcc.h)
 target_link_libraries (ccx ${EXTRA_LIBS})
 target_include_directories (ccx PUBLIC ${EXTRA_INCLUDES})