Commit Graph

2419 Commits

Author SHA1 Message Date
Prateek Sunal
b983de6a54 [IMPROVEMENT] Make Environment variables for Hardsubx optional (#1508)
* feat: automatically link ffmpeg

* fix: ci

* chore: documentation update for vcpkg and hardsubx

* fix: add ffmpeg5 feature

* fix: remove ffmpeg5 feature

* fix: update rsmpeg
2023-03-21 09:53:55 -07:00
Punit Lodha
260052b68c update compilation docs for hardsubx (#1507) 2023-03-20 07:06:39 -07:00
Apteryks
8105bc0b73 linux/configure.ac: Fix tesseract conditional problem. (#1504)
Fixes #1503.

Using tesseract-ocr's stock pkg-config, it would produce an error due to
unquoted whitespace:

  $ test ! -z `pkg-config --libs-only-l --silence-errors tesseract`
  bash: test: syntax error: `-larchive' unexpected

* linux/configure.ac: Use a positive test, and double-quote the $() command
substitution.

Co-authored-by: Carlos Fernandez Sanz <carlos@ccextractor.org>
2023-03-17 07:56:41 -07:00
Apteryks
ea4998f635 linux/Makefile.am: Add missing generated header. (#1505)
This header is generated by the pre-build.sh script.  The compilation
fails if it is missing.

* linux/Makefile.am (ccextractor_SOURCES): Add
../src/lib_ccx/compile_info_real.h.
2023-03-17 07:54:49 -07:00
Archit Bhonsle
cb496a7119 [IMPROVEMENT] getting rid of the warnings during rust builds (#1497) 2023-03-16 00:13:00 +01:00
Prateek Sunal
79958f7393 [IMPROVEMENT] Update documentation for windows build (#1498)
* fix: update instructions for FFMpeg on windows

* fix: update docs in COMPILATION.md

* fix: error in doc
2023-03-13 15:17:30 -07:00
Prateek Sunal
0264e7da2b [IMPROVEMENT] Update Rust and fix windows build (#1480)
* fix: bump leptonica-sys to 0.4.3 and update Cargo.lock

* fix: bump rust version to 1.57.0 and build vcpkg for window hardsubx builds

* fix: add Bcrypt dependency

* fix: switch to rust stable

* chore: bump package versions

* fix: try to remove i686 to fix error

* fix: install tesseract and lint fixes

* fix: try using ffmpeg the third

* fix: include headers

* fix: add rsmpeg

* fix: switch default triplet to static md

* fix: import errors

* fix: directory path

* fix: pre build commands

* fix: update vcxproj

* fix: linux ci

* fix: ci fixes

* chore: lint fixes

* fix: error

* fix: copy include files

* fix: ci error

* fix: link swresample lib

* fix: some errors

* fix: include directory path and include all libraries

* fix: try to add library directories

* fix: fixes in libraries

* fix: formatting ci

* fix: mflat errors

* fix: libcurl

* fix: preprocessor definitions

* fix: add libcrypto

* fix: remove lib_hash to fix conflicts (we have libcrypto already)

* fix: add avcodec and avformat dependencies on windows

* fix: add remaining deps that may fix the build

* fix: add crypt depdency

* fix: rename conflicting names

* Revert "fix: remove lib_hash to fix conflicts (we have libcrypto already)"

This reverts commit f57ff716ed.

* fix: prefix with CC_

* fix: post build actions

* fix: ocr error

* Revert "fix: ocr error"

This reverts commit 92599454b6.

* fix: xcopy error

* fix: generated file name for x64

* fix: ocr error

* fix: add item group at top to see if it works

* fix: remove unwanted headers, removed \\ from VCPKG_ROOT, remove unwanted includes in vcxproj

* fix: add libpng for non hardsubx, comment the broken ocr code again

* fix: libpng path

* feat: add lib png headers in ClCompile

* fix: png.h not found

* fix: last try for ocr fix

* fix: libpng not found

* fix: cl compile headers

* fix: libpng and ocr

* fix: libpng error

* fix: redefinition error

* fix: zlib for non hardsubx

* fix: lib names

* fix: zlib.h not found
2023-03-12 13:45:21 -07:00
Archit Bhonsle
257388bad3 reverting names of the secondary linux build scripts (#1496) 2023-03-12 11:23:28 -07:00
Archit Bhonsle
1604572995 [IMPROVEMENT] linux/build script revamp (#1494)
* improving `linux/build` script

* docs for the improved `linux/build` script
2023-03-12 08:38:06 -07:00
Ibrahim M. Akrab
9125165231 [FIX] tesseract 5.x traineddata location in ocr (#1493)
* fix traineddata location with tesseract version 5.x in ocr

* Add the fix to changelog
2023-03-10 11:14:36 -08:00
Prateek Sunal
b1cbfcea9b fix: ffmpeg 5 and tesseract 5 compatibility (#1479)
* fix: replace deprecated `codec` property with `codecpar`

* fix: replace deprecated method `avcodec_decode_video2` with `avcodec_receive_frame` and `avcodec_send_packet`

* Update CHANGES.TXT

* fix: remove deprecated `av_register_all` function

* fix: formatting

* fix: add support for tesseract 5

* fix: tesseract v5

* fix: hardsubx codec context error

* fix: lint const warning
2023-03-08 12:14:53 -08:00
Prateek Sunal
8bb52fa6d5 fix: broken -hardsubx flag (#1491) 2023-03-08 10:27:38 -08:00
Archit Bhonsle
7bd3f7e788 Adding Arch Linux instructions and other minor fixes to COMPILATION.MD (#1482) 2023-03-07 19:57:19 -08:00
Elbert Ronnie
f4bf40b05d Fix missing # in color attribute of font tag (#1486)
Co-authored-by: Elbert Ronnie <elbertronnie@gmail.com>
2023-03-07 11:01:21 -08:00
dependabot[bot]
b488126d09 Bump microsoft/setup-msbuild from 1.1.3 to 1.3.1 (#1475)
Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild) from 1.1.3 to 1.3.1.
- [Release notes](https://github.com/microsoft/setup-msbuild/releases)
- [Changelog](https://github.com/microsoft/setup-msbuild/blob/main/building-release.md)
- [Commits](https://github.com/microsoft/setup-msbuild/compare/v1.1.3...v1.3.1)

---
updated-dependencies:
- dependency-name: microsoft/setup-msbuild
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-06 18:17:48 +00:00
Willem
1c6160f548 Run clang-format on all source files (#1465) 2022-12-14 22:17:57 +00:00
abhi-kr-2100
40145abccf [FIX] Fix issue #1453: Respect -stdout if multiple CC tracks are found in a Matroska input file (#1460)
* Respect `-stdout` if multiple CC tracks are found

When passed the `-stdout` flag, CCExtractor should write the
subtitles to standard output, instead of an output file.

However, as noted in Issue #1453, CCExtractor doesn't
respect the `-stdout` flag when multiple CC tracks are present in
a Matroska input file (usually .mkv).

This commit ensures that output is written to standard output if `-
stdout` is present even if the input file is a Matroska container
with multiple CC tracks.

Signed-off-by: Abhishek Kumar <abhi.kr.2100@gmail.com>

* Mention fixing of issue #1453 in changelog

Signed-off-by: Abhishek Kumar <abhi.kr.2100@gmail.com>

* Correctly spell Matroska

Signed-off-by: Abhishek Kumar <abhi.kr.2100@gmail.com>

Signed-off-by: Abhishek Kumar <abhi.kr.2100@gmail.com>
2022-12-14 13:46:16 -08:00
emkman99
492f0d5197 [FIX] WebVTT X-TIMESTAMP-MAP header placement (#1463) (#1464)
* [FIX] WebVTT X-TIMESTAMP-MAP header placement (#1463)
* Fixed --no-timestamp-map flag
* Disable X-TIMESTAMP-MAP by default
* X-TIMESTAMP-MAP is only part of the HLS spec, and is not valid WebVTT, so it should be disabled by default.
* Write second WebVTT newline when timing info is missing
2022-12-14 13:44:17 -08:00
dependabot[bot]
4b0928ad9b Bump microsoft/setup-msbuild from 1.0.2 to 1.1.3 (#1456)
Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild) from 1.0.2 to 1.1.3.
- [Release notes](https://github.com/microsoft/setup-msbuild/releases)
- [Changelog](https://github.com/microsoft/setup-msbuild/blob/master/building-release.md)
- [Commits](https://github.com/microsoft/setup-msbuild/compare/v1.0.2...v1.1.3)

---
updated-dependencies:
- dependency-name: microsoft/setup-msbuild
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-01 09:38:16 +01:00
Shashwat Singh
0e3dfdc73b [WIP] Port hardsubx classifier (#1446)
* add tesseract-sys in dependencies of rust modules

* add appropriate feature flags and required packages to cargo toml

* expose classifier

* Redefine structs that are required for hardsubx

Note: rust-bindgen isn't being used directly for this because it will also redefine structures of leptonica, tesseract, and ffmpeg and we don't want that.
We want to use definitions of structs as in the rust interfact libraries we are importing

* write code to generate bindings for mprint

* - write a function to convert rust strings to c strings
- write a memory safe wrapper to mprint that uses above function

* - add helper function to deal with tess strings in a memory safe manner
- port get_ocr_text_simple
- port get_ocr_text_wordwise

* improve conversion of C string to Rust string by using built-in functions

* replace mprint usage with warn!

* port get_ocr_text_letterwise

* remove redundant mprint function

* improve readability _tess_string_helper by using more general variable names inside

* make get_ocr_text_simple call get_ocr_text_simple_threshold to remove redundant codefix bugs

* remove manual definition of cc_subtitle and use bindgen bindings

* style changes to rust hardsubx classifier

* add get_ocr_text_letterwise_threshold and make get_ocr_text_letterwise call it appropriately

* move hardsubx context struct to mod.rs

* add get_ocr_text_wordwise_threshold and make get_ocr_text_wordwise call it

* use the ffmpeg-sys definition of Pix

* hide ported functions under macros

* use the AVPacket from bindings and not ffmpeg to make compatibility work for now.
TODO: rewrite init_hardsubx and also deal with the ffmpeg stuff when that is done

* improce _tess_string_helper by using appropriate built-in functions

* linter recommended changes

* clang style change

* fix loop bug that didn't allow for re-evaluation of it on usage of continue statement

* start porting of decoder with the _process_frame_color_basic function and related code

* hide the C version of _process_frame_color_basic behind an #ifdef

* add _process_frame_tickertext

* hide the C version of _process_frame_tickertext behind ifdef and add #[no_mangle] to the rust version

* check if word is empty as soon as word is detected

* port _process_frame_white_basic

* hide the C version _process_frame_white_basic behind compiler macros

* stylistic changes

* safety docs for hardsubx classifier

* safety docs for decoder as of now

* safe docs for utils.rs

* style changes

* format and style changes

* modify safety docs

* formatting fix
2022-10-24 08:13:28 +02:00
Willem
4cb474c5a3 Update build_windows.yml 2022-07-18 20:54:40 +00:00
Willem
19f6ef43ef Update build_linux.yml 2022-07-18 20:51:22 +00:00
Willem
4dbcbe083e Update build_linux.yml 2022-07-18 20:50:15 +00:00
Willem
2a9a922d1a Update build_linux.yml 2022-07-18 20:46:50 +00:00
Willem
0d3e1d003d Update build_linux.yml
Try to fix bad behaviour for pushes
2022-07-18 20:43:26 +00:00
Shashwat Singh
170066f046 Port hardsubx utility (#1443)
* set up bindings conversion of hardsubx utility functions (and structs) and set up the module

* add low level ffmpeg rust binding

* Methods ported:

- convert_pts_to_ns
- convert_pts_to_ms
- convert_pts_to_s

A pure rust method was added called _edit_distance_rec that implements levenstein distance calculation using recursion and dynamic programming

The port of edit_distance_rec is simply a wrapper that calls above function.

This redundancy won't be nevessary as more downstream modules are ported to Rust

* put C code of hardsubx_utility under define rust flag

* run formatter

* make compilation of hardsubx rust modules conditional on the HARDSUBX and the OCR flags. Make ffmpeg a conditional dependency based on those flags

* remove namespaced dependency in cargo because that is a nightly feature

* add conditioal compilatio of ffmpeg related bindigs in build.rs

* make clang argument of -DENABLE_HARDSUBX conditional on cargo feature of hardsubx_ocr

* enable specific relevant features for ffmpeg-sys-next

* enable hardsubx_ocr feature in windows build

* add build feature in ffmpeg-sys-next

* ffmpeg build feature is conditional on platform

* Revert "ffmpeg build feature is conditional on platform"

This reverts commit e456fee942.

This is because conditional features do not work in cargo toml

* install yasm in the linux build github action for ocr and hardsubx enabled cmake

* turn globals to locals to reduce code

* remove redundant attributes

* style changes

* make import of ffmpeg-sys-next conditional on hardsubx_ocr flag

* add --all-features flag in clippy for github workflow

* run formatter

* fix clippy command

* install yasm as part of rust format build check

* install libtesseract-dev etc. for clippy build test

* readability change

* declare the function edit_distance as unsafe

* remove commented code

* formatting changes

* combine declaration and assignment

* add build command for building hardsubx rust

context to issue: #1445

* make hardsubx rust work with autoconf build. For issue: #1445

* update autoconf for mac for issue #1445
2022-07-13 14:36:30 +05:30
Punit Lodha
0bd213e789 Fix file extension for IDX files (#1444)
* Fix file extension

* Vobsub not supported

* Fix formatting

* More formatting

Co-authored-by: Punit Lodha <punitlodha@pm.com>
2022-07-09 19:04:01 +05:30
Carlos Fernandez Sanz
4712d85190 Maybe make format checker happy? 2022-07-05 14:05:17 -07:00
dependabot[bot]
d95a3b3354 Bump regex from 1.5.4 to 1.5.6 in /src/rust (#1440)
Bumps [regex](https://github.com/rust-lang/regex) from 1.5.4 to 1.5.6.
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.5.4...1.5.6)

---
updated-dependencies:
- dependency-name: regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-18 11:23:03 +05:30
nikolabr
39724fe6a7 [FIX] Fix issue #1421 (#1431)
* [Fix] Fix issue #1421

* Fix header offset
2022-06-17 18:12:23 +00:00
Shashwat Singh
0f90afaa1b Port hardsubx imgops (#1439)
* add hardsubx rust module and expose it

* port rgb_to_hsv to rust

* add dependency fast-math and extern it

* port rgb_to_lab to rust

also make preprocessor to not allow compilation of hardsubx_imgops
if WITHOUT_RUST is OFF

* improve if-else constructs for readability

* unroll  macros that were only used once and remove their definition

* Improve readability of rgb_to_lab function (and fixes)

The function in Rust behaves slightly differently than its C counterpart

* remove fast math library, use palette library and rewrite imgops using it

* run formatter

* replace destructuring assignment statement with normal assignment statements because of build rust compiler issues

* run formatter on C code for imgops

* remove extern for modules because it is not required

* improve comment placement in rust imgops

Co-authored-by: Punit Lodha <48253287+PunitLodha@users.noreply.github.com>
2022-06-15 10:35:03 +05:30
Shashwat Singh
689d92ab59 put generated files of the rust project in the .gitignore (#1441) 2022-06-07 19:50:35 +00:00
dependabot[bot]
ca303d6942 Bump actions/upload-artifact from 2 to 3 (#1430)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-11 09:48:03 +02:00
Shashwat Singh
6a9a16e611 add option to extract closed captions and burnt in subs in the same pass (#1422)
* [NEW] add functionality to allow extraction of cc and burnt-in subs in the same pass
- add flag under hardsubx called -hcc that calls this method
- minor refactoring of moving some code from general_loop to a new function
- appropriate addition to the header files to expose certain methods

* add change log

* run clang formatter
2022-03-27 07:51:23 -07:00
dependabot[bot]
30bc27aa0c Bump actions/cache from 2 to 3 (#1424)
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-21 21:27:00 +00:00
Aditya Pratap Singh
c3fc323150 [IMPROVEMENT] Deprecated the --with-gui flag for linux/configure and mac/configure (#1415)
* Deprecated the --with-gui flag for linux/configure and mac/configure

* Update docs/CHANGES.TXT

Co-authored-by: Willem <github@canihavesome.coffee>

Co-authored-by: Willem <github@canihavesome.coffee>
2022-03-07 13:20:11 +01:00
Willem
b5fe0609fc Update build_windows.yml 2022-03-02 14:31:48 +01:00
Punit Lodha
0a4049c97c Fix clippy warning and Use rust 1.56.0 for CI (#1420)
* Fix cippy warning

* Use rust 1.56.0 for CI

Co-authored-by: Punit Lodha <punitlodha@pm.com>
2022-03-02 14:16:29 +01:00
dependabot[bot]
6e4ac56e9c Bump actions/checkout from 2.4.0 to 3 (#1419)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 18:51:56 +00:00
Shashwat Singh
e6503d5c81 [FIX] segmentation fault when using hardsubx (#1417)
* Fix segmentation fault when using hardsubx
* initialize library before hardsubx call
2022-02-21 09:14:34 -08:00
Willem
1717cbb44d Update CHANGES.TXT 2022-01-24 17:54:00 +00:00
Arpan Kapoor
caa960e657 Fix #1407 (#1409) 2022-01-24 17:52:19 +00:00
Willem
290e2f10f9 Update debian.sh 2021-12-23 19:41:44 +00:00
Willem
325464f793 Update ccextractor.spec 2021-12-23 19:41:20 +00:00
Willem
f533a53902 Update PKGBUILD
Update PKGBUILD based on https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ccextractor
2021-12-23 19:40:23 +00:00
Punit Lodha
97b381a2b0 Switch to rustc 1.56.0 (#1404)
* Update CHANGES.TXT

* Update release flow

* use 1.56.0 compiler as 1.57.0 is bugged

Co-authored-by: PunitLodha <punitlodha@pm.com>
v0.94
2021-12-15 17:03:45 +00:00
Punit Lodha
03b0749e91 Update release flow (#1403)
* Update CHANGES.TXT

* Update release flow

Co-authored-by: PunitLodha <punitlodha@pm.com>
2021-12-15 16:41:11 +00:00
Carlos Fernandez Sanz
7bcdd6729f Bump version 0.93 -> 0.94 2021-12-14 09:46:01 -08:00
Punit Lodha
3dd3d5f6aa Update CHANGES.TXT (#1402)
Co-authored-by: PunitLodha <punitlodha@pm.com>
2021-12-14 09:37:23 -08:00
Ritesh Maurya
ba37cc41c8 Update COMPILATION.MD (#1401)
Most of the users use Ubuntu 18.04 and later, so added the `libtesseract-dev`  rather than `tesseract-ocr-dev` in the bash command so new people don't run into any errors as the NOTE was written after the command.
2021-12-13 08:29:53 -08:00