Refactor/move demuxer options to struct

[AhmedAlian7]

[IMPROVEMENT]

In raising this pull request, I confirm the following (please check boxes):

• I have read and understood the contributors guide.
• I have checked that another pull request for this purpose does not exist.
• I have considered, and confirmed that this submission will be valuable to others.
• I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
• I give this submission freely, and claim no ownership to its content.
• I have mentioned this change in the changelog.

My familiarity with the project is as follows (check one):

• I have never used CCExtractor.
• I have used CCExtractor just a couple of times.
• I absolutely love CCExtractor, but have not contributed previously.
• I am an active contributor to CCExtractor.

---

closes #2101

Summary

Resolves the TODO in file_functions.c:311 by encapsulating demuxer-related options within the ccx_demuxer struct instead of accessing the global ccx_options.

Problem

Multiple functions directly accessed global ccx_options for 4 options that logically belong to the demuxer context:

• live_stream - Live stream mode and timeout
• buffer_input - Whether to buffer input data
• input_source - Source type (file, stdin, network, tcp)
• binary_concat - Whether to concatenate binary files

This caused issues with testability, encapsulation, thread safety, and library reusability.

Changes

src/lib_ccx/ccx_demuxer.h

Added 4 new fields to struct ccx_demuxer:

// Options moved from global ccx_options for encapsulation
int live_stream;                   // -1=live no timeout, 0=regular file, >0=live with timeout
int buffer_input;                  // Buffer input data
enum ccx_datasource input_source;  // Source type (file, stdin, network, tcp)
int binary_concat;                 // Concatenate binary files

src/lib_ccx/ccx_demuxer.c

init_demuxer() - Initialize new fields from global options:

ctx->live_stream = ccx_options.live_stream;
ctx->buffer_input = ccx_options.buffer_input;
ctx->input_source = ccx_options.input_source;
ctx->binary_concat = ccx_options.binary_concat;

ccx_demuxer_close() - Updated to use ctx->input_source.
ccx_demuxer_open() - Updated all input source checks to use ctx->input_source.

src/lib_ccx/file_functions.c

sleepandchecktimeout() - Added ctx parameter.
buffered_read_opt() - Updated all 4 options to use ctx->.
get_total_file_size() - Updated to use ctx->demux_ctx->live_stream.
switch_to_next_file() - Updated all options to use ctx->demux_ctx->.

Testing

• Build succeeds on Linux (make in linux directory)
• Executable runs correctly (ccextractor --version)
• No remaining global references for the 4 options in affected functions
• I have mentioned this change in the changelog.

Impact

• No breaking changes - Options are still initialized from global ccx_options at demuxer creation
• Improved encapsulation - Demuxer now owns its configuration
• Better testability - Functions can be tested with different option values via context

[AhmedAlian7]

Code passes all tests locally, but failed on GitHub CI cuz github server issues

[cfsmp3]

This PR doesn't pass the build CI. Please fix the build failures before requesting review.

Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com

[AhmedAlian7]

@cfsmp3 building failure is fixed, sorry for not noticing that

The issue due to:

1. Symbol Visibility: sleepandchecktimeout was a global symbol in C which could conflict with Rust or cause "missing prototype" errors in strict CI builds.

Changes

1. src/lib_ccx/file_functions.c

Made sleepandchecktimeout static to restrict its visibility to the translation unit, preventing symbol collisions and satisfying strict prototype requirements.

// Before
void sleepandchecktimeout(struct ccx_demuxer *ctx, time_t start)

// After
static void sleepandchecktimeout(struct ccx_demuxer *ctx, time_t start)

Verification Results

Build Verification

• C Build: cmake + make passed successfully with no warnings.
• Rust Build: cargo build passed.
• Rust Clippy: cargo clippy passed.

[AhmedAlian7]

@cfsmp3, plz review this one.

[ccextractor-bot]

CCExtractor CI platform finished running the test files on linux. Below is a summary of the test results, when compared to test for commit 6f7ce27...:

Report Name	Tests Passed
Broken	13/13
CEA-708	14/14
DVB	6/7
DVD	3/3
DVR-MS	2/2
General	25/27
Hardsubx	1/1
Hauppage	3/3
MP4	3/3
NoCC	10/10
Options	81/86
Teletext	21/21
WTV	13/13
XDS	34/34

Your PR breaks these cases:

• ccextractor --autoprogram --out=srt --latin1 --quant 0 85271be4d2...
• ccextractor --autoprogram --out=ttxt --latin1 --ucla dab1c1bd65...
• ccextractor --out=srt --latin1 --autoprogram 29e5ffd34b...
• ccextractor --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsnotbefore 1 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsnotafter 2 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsforatleast 1 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsforatmost 2 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...

Congratulations: Merging this PR would fix the following tests:

• ccextractor --out=spupng c83f765c66..., Last passed: Never

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.

[ccextractor-bot]

CCExtractor CI platform finished running the test files on windows. Below is a summary of the test results, when compared to test for commit 6f7ce27...:

Report Name	Tests Passed
Broken	13/13
CEA-708	14/14
DVB	6/7
DVD	3/3
DVR-MS	2/2
General	25/27
Hardsubx	1/1
Hauppage	3/3
MP4	3/3
NoCC	10/10
Options	81/86
Teletext	21/21
WTV	13/13
XDS	34/34

Your PR breaks these cases:

• ccextractor --autoprogram --out=srt --latin1 --quant 0 85271be4d2...
• ccextractor --autoprogram --out=ttxt --latin1 --ucla dab1c1bd65...
• ccextractor --out=srt --latin1 --autoprogram 29e5ffd34b...
• ccextractor --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsnotbefore 1 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsnotafter 2 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsforatleast 1 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...
• ccextractor --startcreditsforatmost 2 --startcreditstext "CCextractor Start crdit Testing" c4dd893cb9...

Congratulations: Merging this PR would fix the following tests:

• ccextractor --out=spupng c83f765c66..., Last passed: Never

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.

[cfsmp3]

This refactoring has a regression: the options are copied from ccx_options into the demuxer struct once at init time (init_demuxer in ccx_demuxer.c:418), but some code mutates these options at runtime and expects the read logic to see the changes.

Specifically:

1. MythTV buffering: myth_loop in myth.c:813 toggles ccx_options.buffer_input at runtime. After this PR, the read logic in file_functions.c uses ctx->buffer_input (the init-time copy), so it never sees the MythTV override. This breaks MythTV buffering behavior.

2. Live stream timeout: sleepandchecktimeout sets ccx_options.live_stream = 0 when the timeout expires or stdin is detected. Your PR correctly updates ctx->live_stream instead, but any other code that reads the global ccx_options.live_stream after that point would still see the old value, creating an inconsistency.

The fundamental issue is that you can't half-migrate mutable global state — if any code path still mutates the global expecting readers to see it, copying once at init breaks that contract. To do this properly you'd need to also update all runtime mutation sites (myth.c, etc.) to write to the demuxer-local copies instead of the global, and verify no other code reads the global after init.