Repository navigation
[RUST] Added XDS module - #2088
Open
vatsalkeshav wants to merge 34 commits into
Open
[RUST] Added XDS module #2088vatsalkeshav wants to merge 34 commits into
vatsalkeshav wants to merge 34 commits into
Conversation
6 of 10 tasks
Contributor
Author
vatsalkeshav
force-pushed
the
rusty-xds-decoder
branch
from
February 11, 2026 05:19
4a87153 to
bb55f8a
Compare
Contributor
Author
|
Force-pushed after rebasing onto latest |
5 of 10 tasks
steel-bucket
left a comment
steel-bucket
left a comment
Member
There was a problem hiding this comment.
Test it in a setup which tests for the Console output being same as in C, test across 20-30 samples, make a simple test script which tests both for Console Output and subtitle output. I'll give you one you can salvage something from
https://gist.github.com/steel-bucket/11cfe6fa76318256d974f286b8e6cd30
Comment on lines
+7
to
+8
| // declare rust implementation of process_xds_bytes (function) | ||
| extern void ccxr_process_xds_bytes( |
Comment on lines
+256
to
+257
| #ifndef DISABLE_RUST | ||
| ccxr_process_xds_bytes(ctx, hi, lo); // use the rust implementation |
Member
There was a problem hiding this comment.
remove DISABLE_RUST, we deprecated that
Comment on lines
+49
to
+52
| use libc::free; | ||
| use libc::malloc; | ||
|
|
||
| use crate::xds::types::*; |
Comment on lines
+60
to
+63
| pub enum XDSError { | ||
| Err, | ||
| } | ||
|
|
Contributor
Author
There was a problem hiding this comment.
was introduced to remove clippy warning :
warning: this returns a `Result<_, ()>`
--> src/xds/handlers.rs:100:1
|
100 | / pub unsafe fn write_xds_string(
101 | | sub: &mut cc_subtitle,
102 | | ctx: &mut CcxDecodersXdsContext,
103 | | p: String,
104 | | ts_start_of_xds: i64,
105 | | ) -> Result<(), ()> {
| |___________________^
|
= help: use a custom `Error` type instead
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#result_unit_err
= note: `#[warn(clippy::result_unit_err)]` on by default
warning: this returns a `Result<_, ()>`
--> src/xds/handlers.rs:149:1
|
149 | / pub unsafe fn xdsprint(
150 | | sub: &mut cc_subtitle,
151 | | ctx: &mut CcxDecodersXdsContext,
152 | | message: String,
153 | | ) -> Result<(), ()> {
| |___________________^
|
= help: use a custom `Error` type instead
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#result_unit_err
Comment on lines
+167
to
+168
| log::debug!( | ||
| "XDS Start: {}.{} Is new: {} | Class: {} ({}), Used buffers: {}", |
Member
There was a problem hiding this comment.
Import debug standalong instead of log::
Comment on lines
+423
to
+459
| const US_TV_AGE_TEXT: [&str; 8] = [ | ||
| "None", | ||
| "TV-Y (All Children)", | ||
| "TV-Y7 (Older Children)", | ||
| "TV-G (General Audience)", | ||
| "TV-PG (Parental Guidance Suggested)", | ||
| "TV-14 (Parents Strongly Cautioned)", | ||
| "TV-MA (Mature Audience Only)", | ||
| "None", | ||
| ]; | ||
|
|
||
| /// MPA rating text | ||
| const MPA_RATING_TEXT: [&str; 8] = ["N/A", "G", "PG", "PG-13", "R", "NC-17", "X", "Not Rated"]; | ||
|
|
||
| /// Canadian English Language Rating | ||
| const CANADIAN_ENGLISH_RATING_TEXT: [&str; 8] = [ | ||
| "Exempt", | ||
| "Children", | ||
| "Children eight years and older", | ||
| "General programming suitable for all audiences", | ||
| "Parental Guidance", | ||
| "Viewers 14 years and older", | ||
| "Adult Programming", | ||
| "[undefined]", | ||
| ]; | ||
|
|
||
| /// Canadian French Language Rating | ||
| const CANADIAN_FRENCH_RATING_TEXT: [&str; 8] = [ | ||
| "Exempt?es", | ||
| "G?n?ral", | ||
| "G?n?ral - D?conseill? aux jeunes enfants", | ||
| "Cette ?mission peut ne pas convenir aux enfants de moins de 13 ans", | ||
| "Cette ?mission ne convient pas aux moins de 16 ans", | ||
| "Cette ?mission est r?serv?e aux adultes", | ||
| "[invalid]", | ||
| "[invalid]", | ||
| ]; |
Comment on lines
+634
to
+635
| // XDS_TYPE_PIN_START_TIME = 1 | ||
| 1 => { |
Comment on lines
+741
to
+743
| debug!( | ||
| msg_type = DebugMessageFlag::DECODER_XDS; | ||
| ":{:02}", el_sec |
Member
There was a problem hiding this comment.
correct type of debug, use this in other impls
Comment on lines
+59
to
+62
| pub static XDS_PROGRAM_TYPES: [&str; 96] = [ | ||
| "Education", | ||
| "Entertainment", | ||
| "Movie", |
Member
There was a problem hiding this comment.
Move all constants, enums, and statics in a different file
Comment on lines
+381
to
+392
| impl CType<xds_buffer> for XdsBuffer { | ||
| unsafe fn to_ctype(&self) -> xds_buffer { | ||
| xds_buffer { | ||
| in_use: self.in_use, | ||
| xds_class: self.xds_class.map(|c| c.to_c_int()).unwrap_or(-1), | ||
| xds_type: self.xds_type.map(|t| t.to_c_int()).unwrap_or(-1), | ||
| bytes: self.bytes, | ||
| used_bytes: self.used_bytes, | ||
| } | ||
| } | ||
| } | ||
|
|
Contributor
Author
|
I've comitted the required changes from the review |
Contributor
Author
|
Hi, Regression ID Sample Command Runtime (ms) Exit code Result 98 725a49f871... --autoprogram --out=ttxt --latin1 --ucla --xds 674 0 Pass |
steel-bucket
reviewed
Apr 1, 2026
Comment on lines
28
to
29
| libc = "0.2.178" | ||
|
|
Comment on lines
+106
to
+108
| pub extern "C" fn ccxr_set_ts_start_of_xds(value: i64) { | ||
| TS_START_OF_XDS.store(value, Ordering::SeqCst); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
needed to sync TS_START_OF_XDS between C and Rust
Member
|
Other than these and the format failure, PR looks good if there are no regressions. |
Contributor
Author
i;ve pushed the required fixes |
vatsalkeshav
force-pushed
the
rusty-xds-decoder
branch
from
August 11, 2026 06:46
717822c to
961a9dc
Compare
Contributor
|
Needs rebase, cargo fmt... |
Contributor
Author
|
done! |
vatsalkeshav
force-pushed
the
rusty-xds-decoder
branch
from
October 8, 2026 08:44
961a9dc to
9667b87
Compare
Collaborator
CCExtractor CI platform finished running the test files on linux. 171/237 tests matched the approved output:
66 tests do not match the approved output. That is the pass/fail verdict. Whether this branch caused it is a separate question, answered below.
Compared with the tip of master — test 9596, commit e313f70:
Fail on both but produce different output — behaviour moved even though the verdict did not:
Fail there, pass here:
Compared with the commit this branch was cut from: the same run as the tip of master (test 9596), so the comparison above already covers it. This branch changes the behaviour of 29 test(s) relative to the tip of master. Those are the ones worth looking at; anything else in the list fails the same way on both sides. |
Collaborator
CCExtractor CI platform finished running the test files on windows. 154/237 tests matched the approved output:
83 tests do not match the approved output. That is the pass/fail verdict. Whether this branch caused it is a separate question, answered below.
Compared with the tip of master — test 9589, commit 670a5ab:
Compared with the commit this branch was cut from: the same run as the tip of master (test 9589), so the comparison above already covers it. No test changes behaviour relative to the tip of master: every failure above fails there too, byte for byte. The approved output for those tests is out of date, which is a baseline to review rather than a regression in this branch. |
added 21 commits
October 17, 2026 13:11
trait impls
…tType enum, removed XDSerror enum
…s.rs, handlers.rs
…ith lib_ccxr::info
…arate file from types.rs, handlers.rs
vatsalkeshav
force-pushed
the
rusty-xds-decoder
branch
from
October 17, 2026 07:41
9667b87 to
8202fc6
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
In raising this pull request, I confirm the following (please check boxes):
My familiarity with the project is as follows (check one):
(This PR Supersedes #1890; rebased on latest
masterwith fixes from review.)This pull request migrates
ccx_decoders_xds.candccx_decoders_xds.hto/src/rust/xdsrust module.mod.rs: exposes the Rust implementation to the C codebasetypes.rs: has types and structures for decoding extended datahandlers.rs: has handler functions for processing extended data packetsTested against stream : https://sampleplatform.ccextractor.org/sample/b22260d065ab537899baaf34e78a5184671f4bcb2df0414d05e6345adfd7812f