Hardsubx error fixed

Author: steel-bucket

src/lib_ccx/ccx_gxf.c

@@ -53,8 +53,6 @@ int ccxr_read_packet(struct ccx_demuxer *ctx, struct demuxer_data *data);
 int ccxr_gxf_probe(const unsigned char *buf, int len);
 #endif
 
-
-
 typedef enum
 {
 	PKT_MAP = 0xbc,

src/rust/Cargo.lock

@@ -14,6 +14,7 @@ crate-type = ["staticlib"]
 log = "0.4.26"
 env_logger = "0.8.4"
 iconv = "0.1.1"
+palette = "0.6.1"
 rsmpeg = { version = "0.14.2", optional = true, features = [
     "link_system_ffmpeg",
 ] }
@@ -26,8 +27,7 @@ time = "0.3.39"
 cfg-if = "1.0.0"
 num-integer = "0.1.46"
 lib_ccxr = { path = "lib_ccxr" }
-url = "2.5.2"
-palette = "0.7.6"
+url = "2.5.4"
 
 [build-dependencies]
 bindgen = "0.64.0"

src/rust/Cargo.toml

@@ -11,7 +11,6 @@ pub trait ActivityExt {
     fn activity_input_file_closed(&mut self);
     fn activity_input_file_open(&mut self, filename: &str);
     fn activity_report_data_read(&mut self);
-
 }
 impl ActivityExt for Options {
     fn activity_report_version(&mut self) {
@@ -41,14 +40,16 @@ impl ActivityExt for Options {
     fn activity_report_data_read(&mut self) {
         if self.gui_mode_reports {
             let mut stderr = io::stderr();
-            writeln!(stderr, "###DATAREAD#{}", unsafe { NET_ACTIVITY_GUI.load(Ordering::SeqCst)/ 1000 }).unwrap();
+            writeln!(stderr, "###DATAREAD#{}", unsafe {
+                NET_ACTIVITY_GUI.load(Ordering::SeqCst) / 1000
+            })
+            .unwrap();
             stderr.flush().unwrap();
         }
     }
-
 }
 pub fn update_net_activity_gui(value: usize) {
     unsafe {
         NET_ACTIVITY_GUI.store(value, Ordering::SeqCst);
     }
-}
+}

src/rust/lib_ccxr/src/activity.rs

@@ -1,43 +1,43 @@
 pub struct AvcCtx {
-    pub cc_count: u8,  // Number of closed caption blocks
-    pub cc_data: *mut u8,  // Pointer to buffer holding CC data
+    pub cc_count: u8,         // Number of closed caption blocks
+    pub cc_data: *mut u8,     // Pointer to buffer holding CC data
     pub cc_databufsize: i64,  // Buffer size for CC data
-    pub cc_buffer_saved: i32,  // Was the CC buffer saved after the last update?
+    pub cc_buffer_saved: i32, // Was the CC buffer saved after the last update?
 
-    pub got_seq_para: i32,  // Flag indicating if sequence parameters were received
+    pub got_seq_para: i32, // Flag indicating if sequence parameters were received
     pub nal_ref_idc: u32,  // NAL reference ID
-    pub seq_parameter_set_id: i64,  // Sequence parameter set ID
-    pub log2_max_frame_num: i32,  // Log2 of max frame number
-    pub pic_order_cnt_type: i32,  // Picture order count type
-    pub log2_max_pic_order_cnt_lsb: i32,  // Log2 of max picture order count LSB
-    pub frame_mbs_only_flag: i32,  // Flag indicating if only frame MBs are used
+    pub seq_parameter_set_id: i64, // Sequence parameter set ID
+    pub log2_max_frame_num: i32, // Log2 of max frame number
+    pub pic_order_cnt_type: i32, // Picture order count type
+    pub log2_max_pic_order_cnt_lsb: i32, // Log2 of max picture order count LSB
+    pub frame_mbs_only_flag: i32, // Flag indicating if only frame MBs are used
 
     // Use and throw stats for debugging (TODO: clean up later)
-    pub num_nal_unit_type_7: i64,  // Number of NAL units of type 7
-    pub num_vcl_hrd: i64,  // Number of VCL HRD parameters encountered
-    pub num_nal_hrd: i64,  // Number of NAL HRD parameters encountered
-    pub num_jump_in_frames: i64,  // Number of frame jumps detected
-    pub num_unexpected_sei_length: i64,  // Number of unexpected SEI lengths
+    pub num_nal_unit_type_7: i64,       // Number of NAL units of type 7
+    pub num_vcl_hrd: i64,               // Number of VCL HRD parameters encountered
+    pub num_nal_hrd: i64,               // Number of NAL HRD parameters encountered
+    pub num_jump_in_frames: i64,        // Number of frame jumps detected
+    pub num_unexpected_sei_length: i64, // Number of unexpected SEI lengths
 
-    pub ccblocks_in_avc_total: i32,  // Total CC blocks in AVC stream
+    pub ccblocks_in_avc_total: i32, // Total CC blocks in AVC stream
     pub ccblocks_in_avc_lost: i32,  // Lost CC blocks in AVC stream
 
-    pub frame_num: i64,  // Current frame number
-    pub lastframe_num: i64,  // Last processed frame number
-    pub currref: i32,  // Current reference index
-    pub maxidx: i32,  // Maximum index value for ordering
-    pub lastmaxidx: i32,  // Last max index
+    pub frame_num: i64,     // Current frame number
+    pub lastframe_num: i64, // Last processed frame number
+    pub currref: i32,       // Current reference index
+    pub maxidx: i32,        // Maximum index value for ordering
+    pub lastmaxidx: i32,    // Last max index
 
     // Used to find tref zero in PTS mode
-    pub minidx: i32,  // Minimum reference index
-    pub lastminidx: i32,  // Last minimum reference index
+    pub minidx: i32,     // Minimum reference index
+    pub lastminidx: i32, // Last minimum reference index
 
     // Used to remember the max temporal reference number (POC mode)
-    pub maxtref: i32,  // Max temporal reference
-    pub last_gop_maxtref: i32,  // Last GOP max temporal reference
+    pub maxtref: i32,          // Max temporal reference
+    pub last_gop_maxtref: i32, // Last GOP max temporal reference
 
     // Used for PTS ordering of CC blocks
-    pub currefpts: i64,  // Current reference PTS
-    pub last_pic_order_cnt_lsb: i64,  // Last picture order count LSB
-    pub last_slice_pts: i64,  // Last slice PTS
+    pub currefpts: i64,              // Current reference PTS
+    pub last_pic_order_cnt_lsb: i64, // Last picture order count LSB
+    pub last_slice_pts: i64,         // Last slice PTS
 }

src/rust/lib_ccxr/src/avc_functions/avc_functions.rs

@@ -1 +1 @@
-pub mod avc_functions;
+pub mod avc_functions;

src/rust/lib_ccxr/src/avc_functions/mod.rs

@@ -258,7 +258,6 @@ impl From<u32> for DataSource {
     }
 }
 
-
 #[derive(Default, Debug, PartialEq, Eq, Clone, Copy)]
 pub enum StreamMode {
     #[default]
@@ -643,4 +642,4 @@ impl PartialEq for BufferdataType {
     fn eq(&self, other: &Self) -> bool {
         std::mem::discriminant(self) == std::mem::discriminant(other)
     }
-}
+}

src/rust/lib_ccxr/src/common/constants.rs

@@ -1,11 +1,9 @@
-use crate::time::Timestamp;
 use crate::demuxer::xds::XdsContext;
+use crate::time::Timestamp;
 
 const MAXBFRAMES: usize = 50;
 const SORTBUF: usize = 2 * MAXBFRAMES + 1;
 
-
-
 pub const CCX_OK: i32 = 0;
 pub const CCX_FALSE: i32 = 0;
 pub const CCX_TRUE: i32 = 1;
@@ -31,9 +29,9 @@ pub struct LibCcDecode {
     pub write_format: crate::common::OutputFormat, // 0 = Raw, 1 = srt, 2 = SMI
     pub extraction_start: Option<Timestamp>,
     pub extraction_end: Option<Timestamp>, // Segment we actually process
-    pub subs_delay: i64, // ms to delay (or advance) subs
-    pub extract: i32, // Extract 1st, 2nd or both fields
-    pub fullbin: i32, // Disable pruning of padding cc blocks
+    pub subs_delay: i64,                   // ms to delay (or advance) subs
+    pub extract: i32,                      // Extract 1st, 2nd or both fields
+    pub fullbin: i32,                      // Disable pruning of padding cc blocks
     // TODO when cc_subtitle completed
     // pub dec_sub: cc_subtitle,
     pub in_bufferdatatype: crate::common::BufferdataType,
@@ -198,4 +196,4 @@ impl Default for LibCcDecode {
             prev: std::ptr::null_mut(),
         }
     }
-}
+}