Merge branch 'master' into master

Tarun-Arora · Mar 23, 2023 · d9fbda7 · d9fbda7
2 parents 7243894 + d379d72
commit d9fbda7
Show file tree

Hide file tree

Showing 252 changed files with 2,499 additions and 35,441 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -1,6 +1,7 @@
 name: Build CCExtractor on Linux
 
 on:
+  workflow_dispatch:
   push:
     paths:
 jobs:
@@ -56,11 +57,14 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: dependencies
-      run: sudo apt update && sudo apt install libtesseract-dev libavformat-dev libswscale-dev
+      run: sudo apt update && sudo apt install libtesseract-dev libavformat-dev libavdevice-dev libswscale-dev yasm
     - name: cmake
-      run: mkdir build && cd build && cmake -DWITH_OCR=ON -DWITH_HARDSUBX=ON ../src
+      run: |
+        mkdir build && cd build
+        cmake -DWITH_OCR=ON -DWITH_HARDSUBX=ON ../src
     - name: build
-      run: make -j$(nproc)
+      run: |
+        make -j$(nproc)
       working-directory: build
     - name: Display version information
       run: ./build/ccextractor --version
@@ -79,7 +83,7 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
       - name: build
         run: cargo build 

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -1,6 +1,7 @@
 name: Build CCExtractor on Windows
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - ".github/workflows/build_windows.yml"
@@ -14,21 +15,32 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
+        with:
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install libpng --triplet x64-windows-static-md
       - name: build Release
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
         run: msbuild ccextractor.sln /p:Configuration=Release /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
@@ -46,21 +58,32 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
+        with:
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install libpng --triplet x64-windows-static-md
       - name: build Debug
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
         run: msbuild ccextractor.sln /p:Configuration=Debug /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
@@ -79,53 +102,65 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
-        uses: egor-tensin/setup-clang@v1
-        with:
-          version: latest
-          platform: x86
+        run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
-          target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
+        with:
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static-md
       - name: build Release-Full
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=Win32
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
+        run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
         run: ./ccextractorwinfull.exe --version
-        working-directory: ./windows/Release-Full
+        working-directory: ./windows/x64/Release-Full
       - uses: actions/upload-artifact@v3
         with:
           name: CCExtractor Windows OCR and HardSubX Release build
           path: |
-            ./windows/Release-Full/ccextractorwinfull.exe
-            ./windows/Release-Full/*.dll
+            ./windows/x64/Release-Full/ccextractorwinfull.exe
+            ./windows/x64/Release-Full/*.dll
   build_ocr_hardsubx_debug:
     runs-on: windows-2019
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
-        uses: egor-tensin/setup-clang@v1
+        run: choco install llvm
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
         with:
-          version: latest
-          platform: x86
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static-md
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
-          target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
       - name: build Debug-Full
@@ -134,15 +169,17 @@ jobs:
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=Win32
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
+        run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
         run: ./ccextractorwinfull.exe --version
-        working-directory: ./windows/Debug-Full
+        working-directory: ./windows/x64/Debug-Full
       - uses: actions/upload-artifact@v3
         with:
           name: CCExtractor Windows OCR and HardSubX Debug build
           path: |
-            ./windows/Debug-Full/ccextractorwinfull.exe
-            ./windows/Debug-Full/ccextractorwinfull.pdb
-            ./windows/Debug-Full/*.dll
+            ./windows/x64/Debug-Full/ccextractorwinfull.exe
+            ./windows/x64/Debug-Full/ccextractorwinfull.pdb
+            ./windows/x64/Debug-Full/*.dll
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -42,10 +42,13 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
           components: rustfmt, clippy
+      - name: dependencies
+        run: sudo apt update && sudo apt install libtesseract-dev  libavformat-dev libavdevice-dev libswscale-dev yasm
       - name: rustfmt
         run: cargo fmt --all -- --check
       - name: clippy
-        run: cargo clippy -- -D warnings
+        run: |
+          cargo clippy --all-features -- -D warnings
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,17 +16,16 @@ jobs:
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
       shell: bash
     - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.3.1
     - name: Install llvm and clang
       uses: egor-tensin/setup-clang@v1
       with:
         version: latest
-        platform: x86
+        platform: x64
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.56.0
+        toolchain: stable
         override: true
-        target: i686-pc-windows-msvc
     - name: Install Win 10 SDK
       uses: ilammy/msvc-dev-cmd@v1
     - name: build Release-Full

diff --git a/.gitignore b/.gitignore
@@ -150,3 +150,7 @@ src/rust/CMakeCache.txt
 src/rust/Makefile
 src/rust/cmake_install.cmake
 src/rust/target/
+windows/ccx_rust.lib
+windows/*/debug/*
+windows/*/CACHEDIR.TAG
+windows/.rustc_info.json
diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT
@@ -1,11 +1,19 @@
 0.95 (to be released)
 -----------------
+- Fix: respect `-stdout` even if multiple CC tracks are present in a Matroska input file (#1453)
 - Fix: crash in Rust decoder on ATSC1.0 TS Files (#1407)
 - Removed the --with-gui flag for linux/configure and mac/configure (use the Flutter GUI instead)
 - Fix: segmentation fault in using hardsubx
 - New: Add function (and command) that extracts closed caption subtitles as well as burnt-in subtitles from a file in a single pass. (As proposed in issue 726)
 - Refactored: the `general_loop` function has some code moved to a new function
-
+- Fix: WebVTT X-TIMESTAMP-MAP placement (#1463)
+- Disable X-TIMESTAMP-MAP by default (changed option --no-timestamp-map to --timestamp-map)
+- Fix: missing `#` in color attribute of font tag
+- Fix: ffmpeg 5.0, tesseract 5.0 compatibility and remove deprecated methods
+- Fix: tesseract 5.x traineddata location in ocr
+- Fix: fix autoconf tesseract detection problem (#1503)
+- Fix: add missing compile_info_real.h source to Autotools build
+- Fix: add missing `-lavfilter` for hardsubx linking
 
 0.94 (2021-12-14)
 -----------------