fix(dvb): Enable OCR for all DVB subtitle streams, not just first #1931
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit fixes two issues: 1. ATSC CC data in private MPEG-2 streams (stream type 0x06) was not being processed. The code returned CCX_PRIVATE_MPEG2_CC buffer type which was never properly implemented - it just dumped debug output and returned placeholder bytes. Fix: Treat ATSC CC in private MPEG-2 streams the same as in user-private streams (0x80-0x8F) by returning CCX_PES buffer type. Both contain the same CC data format and should use the same processing path. 2. Several dump() calls were using CCX_DMT_GENERIC_NOTICES which is enabled by default, causing binary output to flood the terminal when processing certain files. Fix: Changed to appropriate debug-only masks (CCX_DMT_VERBOSE, CCX_DMT_PARSE) so binary dumps only appear when debug mode is explicitly enabled. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Add build_*/ pattern and linux/build_scan/ to ignore various build output directories (build_ocr/, build_ocr_asan/, etc.) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Previously, the `initialized_ocr` flag was stored at the program level and shared across all DVB subtitle streams within a program. This caused OCR to only initialize for the first DVB stream, leaving subsequent streams without an OCR context and unable to extract subtitles. The fix removes the `initialized_ocr` flag entirely. Each DVB subtitle decoder now gets its own OCR context, matching the behavior of DVD and VOBSUB decoders which already worked correctly with multiple streams. Test results with multi-language DVB sample: - Before: Second stream (0xCE0) → "No captions were found" - After: Second stream (0xCE0) → 5 subtitles extracted correctly Fixes CCExtractor#1067 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Collaborator
CCExtractor CI platform finished running the test files on linux. Below is a summary of the test results, when compared to test for commit fd15528...:
Congratulations: Merging this PR would fix the following tests:
All tests passed completely. Check the result page for more info. |
Collaborator
CCExtractor CI platform finished running the test files on windows. Below is a summary of the test results, when compared to test for commit 26e0f64...:
Your PR breaks these cases:
It seems that not all tests were passed completely. This is an indication that the output of some files is not as expected (but might be according to you). Check the result page for more info. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
initialized_ocrflag that incorrectly prevented OCR initialization for subsequent streamsRoot Cause
The
initialized_ocrflag was stored at the program level (pinfo->initialized_ocr), shared across all DVB subtitle streams within a program. When the first DVB stream was initialized, it set this flag to 1. Subsequent streams saw the flag was set and skipped OCR initialization, leaving them withocr_ctx = NULL.Test Plan
Tested with multi-language DVB sample containing Finnish (PID 0xCDF) and Dutch (PID 0xCE0) subtitle streams:
Before fix:
After fix:
Both streams now extract correctly:
Fixes #1067
🤖 Generated with Claude Code