Skip to content

[FIX] 134 Codes in XDS and General Tests #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prateekmedia merged 5 commits into from
Jul 6, 2025
Merged

[FIX] 134 Codes in XDS and General Tests #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fb9b3c
Made pointers valid in Unit Tests of Decoder
steel-bucket Jul 6, 2025
1596765
fix: test_do_cb
steel-bucket Jul 6, 2025
8c0fcd3
Copilot Suggestions
steel-bucket Jul 6, 2025
3ea122b
Suggestions about Redundancy
steel-bucket Jul 6, 2025
15319d7
Suggestions about Redundancy
steel-bucket Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 28 additions & 21 deletions src/rust/src/decoder/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,35 +44,24 @@ pub struct Dtvcc<'a> {
impl<'a> Dtvcc<'a> {
/// Create a new dtvcc context
pub fn new(ctx: &'a mut dtvcc_ctx) -> Self {
let report = if !ctx.report.is_null() {
unsafe { Box::new(*(ctx.report)) }
} else {
Box::new(ccx_decoder_dtvcc_report::default())
};
let encoder = if !ctx.encoder.is_null() {
unsafe { Box::new(*(ctx.encoder as *mut encoder_ctx)) }
} else {
Box::new(encoder_ctx::default())
};
let timing = if !ctx.timing.is_null() {
unsafe { Box::new(*(ctx.timing)) }
} else {
Box::new(ccx_common_timing_ctx::default())
};
let report = unsafe { &mut *ctx.report };
let encoder = unsafe { &mut *(ctx.encoder as *mut encoder_ctx) };
let timing = unsafe { &mut *ctx.timing };

Self {
is_active: is_true(ctx.is_active),
active_services_count: ctx.active_services_count as u8,
services_active: ctx.services_active.to_vec(),
report_enabled: is_true(ctx.report_enabled),
report: Box::leak(report),
report,
decoders: ctx.decoders.iter_mut().collect(),
packet: ctx.current_packet.to_vec(),
packet_length: ctx.current_packet_length as u8,
is_header_parsed: is_true(ctx.is_current_packet_header_parsed),
last_sequence: ctx.last_sequence,
encoder: Box::leak(encoder),
encoder,
no_rollup: is_true(ctx.no_rollup),
timing: Box::leak(timing),
timing,
}
}
/// Process cc data and add it to the dtvcc packet
Expand Down Expand Up @@ -247,13 +236,27 @@ impl PartialEq for dtvcc_symbol {
}

#[cfg(test)]
mod test {
pub mod test {
use lib_ccxr::util::log::{set_logger, CCExtractorLogger, DebugMessageMask, OutputTarget};

use crate::utils::get_zero_allocated_obj;

use super::*;

pub fn initialize_dtvcc_ctx() -> Box<dtvcc_ctx> {
let mut ctx = get_zero_allocated_obj::<dtvcc_ctx>();

// Initialize the required pointers to avoid null pointer dereference
let report = Box::new(ccx_decoder_dtvcc_report::default());
ctx.report = Box::into_raw(report);

let encoder = Box::new(encoder_ctx::default());
ctx.encoder = Box::into_raw(encoder) as *mut _ as *mut std::os::raw::c_void;

let timing = Box::new(ccx_common_timing_ctx::default());
ctx.timing = Box::into_raw(timing);
ctx
}
#[test]
fn test_process_cc_data() {
set_logger(CCExtractorLogger::new(
Expand All @@ -262,7 +265,9 @@ mod test {
false,
))
.ok();
let mut dtvcc_ctx = get_zero_allocated_obj::<dtvcc_ctx>();

let mut dtvcc_ctx = initialize_dtvcc_ctx();

let mut decoder = Dtvcc::new(&mut dtvcc_ctx);

// Case 1: cc_type = 2
Expand Down Expand Up @@ -311,7 +316,9 @@ mod test {
false,
))
.ok();
let mut dtvcc_ctx = get_zero_allocated_obj::<dtvcc_ctx>();

let mut dtvcc_ctx = initialize_dtvcc_ctx();

let mut decoder = Dtvcc::new(&mut dtvcc_ctx);

// Case 1: Without providing last_sequence
Expand Down
117 changes: 59 additions & 58 deletions src/rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use std::os::windows::io::{FromRawHandle, RawHandle};

use args::Args;
use bindings::*;
use cfg_if::cfg_if;
use cfg_if::cfg_if;
use clap::{error::ErrorKind, Parser};
use common::{copy_from_rust, CType, CType2};
use decoder::Dtvcc;
Expand All @@ -43,62 +43,62 @@ use std::{
os::raw::{c_char, c_double, c_int, c_long, c_uint},
};

// Mock data for rust unit tests
cfg_if! {
if #[cfg(test)] {
static mut cb_708: c_int = 0;
static mut cb_field1: c_int = 0;
static mut cb_field2: c_int = 0;
static mut current_fps: c_double = 30.0;
static mut usercolor_rgb: [c_int; 8] = [0; 8];
static mut FILEBUFFERSIZE: c_int = 0;
static mut MPEG_CLOCK_FREQ: c_int = 90000;

static mut frames_since_ref_time: c_int = 0;
static mut total_frames_count: c_uint = 0;
static mut fts_at_gop_start: c_long = 0;
static mut gop_rollover: c_int = 0;
static mut pts_big_change: c_uint = 0;

static mut tlt_config: ccx_s_teletext_config = unsafe { std::mem::zeroed() };
static mut ccx_options: ccx_s_options = unsafe { std::mem::zeroed() };
static mut gop_time: gop_time_code = unsafe { std::mem::zeroed() };
static mut first_gop_time: gop_time_code = unsafe { std::mem::zeroed() };
static mut ccx_common_timing_settings: ccx_common_timing_settings_t = unsafe { std::mem::zeroed() };
static mut capitalization_list: word_list = unsafe { std::mem::zeroed() };
static mut profane: word_list = unsafe { std::mem::zeroed() };

unsafe extern "C" fn version(_location: *const c_char) {}
unsafe extern "C" fn set_binary_mode() {}
}
}

// External C symbols (only when not testing)
#[cfg(not(test))]
extern "C" {
static mut cb_708: c_int;
static mut cb_field1: c_int;
static mut cb_field2: c_int;
static mut current_fps: c_double;
static mut usercolor_rgb: [c_int; 8];
static mut FILEBUFFERSIZE: c_int;
static mut MPEG_CLOCK_FREQ: c_int;
static mut tlt_config: ccx_s_teletext_config;
static mut ccx_options: ccx_s_options;
static mut frames_since_ref_time: c_int;
static mut total_frames_count: c_uint;
static mut gop_time: gop_time_code;
static mut first_gop_time: gop_time_code;
static mut fts_at_gop_start: c_long;
static mut gop_rollover: c_int;
static mut ccx_common_timing_settings: ccx_common_timing_settings_t;
static mut capitalization_list: word_list;
static mut profane: word_list;
static mut pts_big_change: c_uint;

fn version(location: *const c_char);
fn set_binary_mode();
}
// Mock data for rust unit tests
cfg_if! {
if #[cfg(test)] {
static mut cb_708: c_int = 0;
static mut cb_field1: c_int = 0;
static mut cb_field2: c_int = 0;
static mut current_fps: c_double = 30.0;
static mut usercolor_rgb: [c_int; 8] = [0; 8];
static mut FILEBUFFERSIZE: c_int = 0;
static mut MPEG_CLOCK_FREQ: c_int = 90000;
static mut frames_since_ref_time: c_int = 0;
static mut total_frames_count: c_uint = 0;
static mut fts_at_gop_start: c_long = 0;
static mut gop_rollover: c_int = 0;
static mut pts_big_change: c_uint = 0;
static mut tlt_config: ccx_s_teletext_config = unsafe { std::mem::zeroed() };
static mut ccx_options: ccx_s_options = unsafe { std::mem::zeroed() };
static mut gop_time: gop_time_code = unsafe { std::mem::zeroed() };
static mut first_gop_time: gop_time_code = unsafe { std::mem::zeroed() };
static mut ccx_common_timing_settings: ccx_common_timing_settings_t = unsafe { std::mem::zeroed() };
static mut capitalization_list: word_list = unsafe { std::mem::zeroed() };
static mut profane: word_list = unsafe { std::mem::zeroed() };
unsafe extern "C" fn version(_location: *const c_char) {}
unsafe extern "C" fn set_binary_mode() {}
}
}
// External C symbols (only when not testing)
#[cfg(not(test))]
extern "C" {
static mut cb_708: c_int;
static mut cb_field1: c_int;
static mut cb_field2: c_int;
static mut current_fps: c_double;
static mut usercolor_rgb: [c_int; 8];
static mut FILEBUFFERSIZE: c_int;
static mut MPEG_CLOCK_FREQ: c_int;
static mut tlt_config: ccx_s_teletext_config;
static mut ccx_options: ccx_s_options;
static mut frames_since_ref_time: c_int;
static mut total_frames_count: c_uint;
static mut gop_time: gop_time_code;
static mut first_gop_time: gop_time_code;
static mut fts_at_gop_start: c_long;
static mut gop_rollover: c_int;
static mut ccx_common_timing_settings: ccx_common_timing_settings_t;
static mut capitalization_list: word_list;
static mut profane: word_list;
static mut pts_big_change: c_uint;
fn version(location: *const c_char);
fn set_binary_mode();
}

/// Initialize env logger with custom format, using stdout as target
#[no_mangle]
Expand Down Expand Up @@ -352,7 +352,8 @@ mod test {

#[test]
fn test_do_cb() {
let mut dtvcc_ctx = utils::get_zero_allocated_obj::<dtvcc_ctx>();
let mut dtvcc_ctx = crate::decoder::test::initialize_dtvcc_ctx();

let mut dtvcc = Dtvcc::new(&mut dtvcc_ctx);

let mut decoder_ctx = lib_cc_decode::default();
Expand Down
Loading