Demuxer: Failing ES regressions

Author: steel-bucket

src/rust/src/ctorust.rs

@@ -131,7 +131,7 @@ impl FromCType<ccx_decoder_dtvcc_settings> for DecoderDtvccSettings {
             print_file_reports: settings.print_file_reports != 0,
             no_rollup: settings.no_rollup != 0,
             report: if !settings.report.is_null() {
-                Some(DecoderDtvccReport::from_ctype(*settings.report)?)
+                Some(DecoderDtvccReport::from_ctype(settings.report)?)
             } else {
                 None
             },
@@ -143,11 +143,16 @@ impl FromCType<ccx_decoder_dtvcc_settings> for DecoderDtvccSettings {
 }
 
 // Implementation for DecoderDtvccReport
-impl FromCType<ccx_decoder_dtvcc_report> for DecoderDtvccReport {
-    unsafe fn from_ctype(report: ccx_decoder_dtvcc_report) -> Option<Self> {
+impl FromCType<*const ccx_decoder_dtvcc_report> for DecoderDtvccReport {
+    unsafe fn from_ctype(report_ptr: *const ccx_decoder_dtvcc_report) -> Option<Self> {
+        if report_ptr.is_null() {
+            return None;
+        }
+
+        let report = &*report_ptr; // Get a reference instead of copying
         Some(DecoderDtvccReport {
             reset_count: report.reset_count,
-            services: report.services.map(|svc| svc),
+            services: report.services,
         })
     }
 }

src/rust/src/es/core.rs

@@ -201,26 +201,26 @@ pub unsafe fn dump(start: *const u8, l: i32, abs_start: u64, clear_high_bit: u32
 
     let mut x = 0;
     while x < l {
-        info!("{:08} | ", x + abs_start as i32);
+        debug!(msg_type = DebugMessageFlag::VERBOSE;"{:08} | ", x + abs_start as i32);
 
         for j in 0..16 {
             if x + j < l {
-                info!("{:02X} ", data[(x + j) as usize]);
+                debug!(msg_type = DebugMessageFlag::VERBOSE;"{:02X} ", data[(x + j) as usize]);
             } else {
-                info!("   ");
+                debug!(msg_type = DebugMessageFlag::VERBOSE;"   ");
             }
         }
-        info!(" | ");
+        debug!(msg_type = DebugMessageFlag::VERBOSE;" | ");
 
         for j in 0..16 {
             if x + j < l && data[(x + j) as usize] >= b' ' {
                 let ch = data[(x + j) as usize] & (if clear_high_bit != 0 { 0x7F } else { 0xFF });
-                info!("{}", ch as char);
+                debug!(msg_type = DebugMessageFlag::VERBOSE;"{}", ch as char);
             } else {
-                info!(" ");
+                debug!(msg_type = DebugMessageFlag::VERBOSE;" ");
             }
         }
-        info!("\n");
+        debug!(msg_type = DebugMessageFlag::VERBOSE;"\n");
         x += 16;
     }
 }

src/rust/src/es/mod.rs

@@ -2,6 +2,8 @@ use crate::bindings::{cc_subtitle, encoder_ctx, lib_cc_decode};
 use crate::ccx_options;
 use crate::es::core::process_m2v;
 use lib_ccxr::common::Options;
+use lib_ccxr::debug;
+use lib_ccxr::util::log::DebugMessageFlag;
 
 pub mod core;
 pub mod eau;
@@ -31,13 +33,15 @@ pub unsafe extern "C" fn ccxr_process_m2v(
     };
 
     let data_slice = std::slice::from_raw_parts(data, length);
-    process_m2v(
+    let processedvalue = process_m2v(
         &mut *enc_ctx,
         &mut *dec_ctx,
         data_slice,
         length,
         &mut *sub,
         &mut CcxOptions,
     )
-    .unwrap_or(0)
+    .unwrap_or(0);
+    debug!(msg_type = DebugMessageFlag::VERBOSE;"Data slice is {:p} with length {} \n", data, length);
+    processedvalue
 }

src/rust/src/es/userdata.rs

@@ -265,7 +265,7 @@ pub unsafe fn user_data(
                 debug!(msg_type = DebugMessageFlag::VERBOSE; "Reading {} HDTV CC blocks", cc_count);
 
                 let mut proceed = true;
-                let cc_data = ustream.read_bytes(cc_count as usize * 3)?;
+                let cc_data = ustream.read_bytes(cc_count as usize * 3 + 1)?;
                 if ustream.bits_left < 0 {
                     fatal!(cause = ExitCause::Bug; "In user_data: ustream->bitsleft < 0. Cannot continue.");
                 }

src/rust/src/lib.rs

@@ -150,6 +150,25 @@ extern "C" {
         len: usize,
         sub: *mut cc_subtitle,
     ) -> c_int;
+    fn print_file_report(ctx: *mut lib_ccx_ctx);
+    #[allow(dead_code)]
+    #[cfg(feature = "enable_ffmpeg")]
+    fn init_ffmpeg(path: *const c_char);
+    pub fn start_tcp_srv(port: *const c_char, pwd: *const c_char) -> c_int;
+    pub fn start_upd_srv(src: *const c_char, addr: *const c_char, port: c_uint) -> c_int;
+    pub fn net_udp_read(
+        socket: c_int,
+        buffer: *mut c_void,
+        length: usize,
+        src_str: *const c_char,
+        addr_str: *const c_char,
+    ) -> c_int;
+    pub fn net_tcp_read(socket: c_int, buffer: *mut c_void, length: usize) -> c_int;
+    pub fn ccx_probe_mxf(ctx: *mut ccx_demuxer) -> c_int;
+    pub fn ccx_mxf_init(demux: *mut ccx_demuxer) -> *mut MXFContext;
+    #[allow(clashing_extern_declarations)]
+    pub fn ccx_gxf_probe(buf: *const c_uchar, len: c_int) -> c_int;
+    pub fn ccx_gxf_init(arg: *mut ccx_demuxer) -> *mut ccx_gxf;
 }
 
 /// Initialize env logger with custom format, using stdout as target
@@ -292,29 +311,6 @@ extern "C" fn ccxr_close_handle(handle: RawHandle) {
     }
 }
 
-extern "C" {
-    #[allow(dead_code)]
-    fn print_file_report(ctx: *mut lib_ccx_ctx);
-    #[allow(dead_code)]
-    #[cfg(feature = "enable_ffmpeg")]
-    fn init_ffmpeg(path: *const c_char);
-    pub fn start_tcp_srv(port: *const c_char, pwd: *const c_char) -> c_int;
-    pub fn start_upd_srv(src: *const c_char, addr: *const c_char, port: c_uint) -> c_int;
-    pub fn net_udp_read(
-        socket: c_int,
-        buffer: *mut c_void,
-        length: usize,
-        src_str: *const c_char,
-        addr_str: *const c_char,
-    ) -> c_int;
-    pub fn net_tcp_read(socket: c_int, buffer: *mut c_void, length: usize) -> c_int;
-    pub fn ccx_probe_mxf(ctx: *mut ccx_demuxer) -> c_int;
-    pub fn ccx_mxf_init(demux: *mut ccx_demuxer) -> *mut MXFContext;
-    #[allow(clashing_extern_declarations)]
-    pub fn ccx_gxf_probe(buf: *const c_uchar, len: c_int) -> c_int;
-    pub fn ccx_gxf_init(arg: *mut ccx_demuxer) -> *mut ccx_gxf;
-}
-
 /// # Safety
 /// Safe if argv is a valid pointer
 ///