Rewriting Dtvcc::new() to instantiate

Author: ArchitBhonsle

.gitignore

@@ -44,6 +44,7 @@ windows/.vs/**
 *.opendb
 *.db
 *.vscode
+.cache
 
 ####
 # Ignore the header file that is updated upon build
@@ -153,4 +154,4 @@ src/rust/target/
 windows/ccx_rust.lib
 windows/*/debug/*
 windows/*/CACHEDIR.TAG
-windows/.rustc_info.json
+windows/.rustc_info.json

src/rust/build.rs

@@ -57,6 +57,7 @@ fn main() {
     }
 
     let bindings = builder
+        .derive_default(true)
         // Finish the builder and generate the bindings.
         .generate()
         // Unwrap the Result and panic on failure.

src/rust/src/decoder/mod.rs

@@ -19,6 +19,7 @@ const CCX_DTVCC_SCREENGRID_ROWS: u8 = 75;
 const CCX_DTVCC_SCREENGRID_COLUMNS: u8 = 210;
 const CCX_DTVCC_MAX_ROWS: u8 = 15;
 const CCX_DTVCC_MAX_COLUMNS: u8 = 32 * 2;
+const CCX_DTVCC_MAX_SERVICES: usize = 63;
 
 /// Context required for processing 708 data
 pub struct Dtvcc<'a> {
@@ -39,26 +40,60 @@ pub struct Dtvcc<'a> {
 
 impl<'a> Dtvcc<'a> {
     /// Create a new dtvcc context
-    pub fn new(ctx: &'a mut dtvcc_ctx) -> Self {
-        let report = unsafe { &mut *ctx.report };
-        let encoder = unsafe { &mut *(ctx.encoder as *mut encoder_ctx) };
-        let timing = unsafe { &mut *ctx.timing };
+    pub fn new(opts: &'a mut ccx_decoder_dtvcc_settings) -> Self {
+        let report = unsafe { &mut *opts.report };
+        report.reset_count = 0;
+
+        let decoders = (0..CCX_DTVCC_MAX_SERVICES)
+            .map(|i| {
+                if !is_true(opts.services_enabled[i]) {
+                    return unsafe { &mut *std::ptr::null_mut() };
+                }
+
+                let decoder = Box::leak(Box::new(dtvcc_service_decoder {
+                    tv: Box::leak(Box::new(dtvcc_tv_screen {
+                        cc_count: 0,
+                        service_number: i as i32 + 1,
+                        ..dtvcc_tv_screen::default()
+                    })),
+                    ..dtvcc_service_decoder::default()
+                }));
+
+                decoder.windows.iter_mut().for_each(|w| {
+                    w.memory_reserved = 0;
+                });
+
+                unsafe { dtvcc_windows_reset(decoder) };
+
+                decoder
+            })
+            .collect();
+
+        for i in 0..CCX_DTVCC_MAX_SERVICES {
+            if !is_true(opts.services_enabled[i]) {
+                continue;
+            }
+        }
+
+        // dtvcc_clear_packet sets current_packet_length, is_current_packet_header_parsed, current_packet to 0
 
         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,
-            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,
-            no_rollup: is_true(ctx.no_rollup),
-            timing,
+            decoders,
+            is_active: false,
+            no_rollup: is_true(opts.no_rollup),
+            active_services_count: opts.active_services_count as u8,
+            services_active: opts.services_enabled.to_vec(),
+            packet_length: 0,
+            is_header_parsed: false,
+            packet: vec![0; CCX_DTVCC_MAX_SERVICES],
+            last_sequence: CCX_DTVCC_NO_LAST_SEQUENCE,
+            report_enabled: is_true(opts.print_file_reports),
+            timing: unsafe { &mut *opts.timing },
+            encoder: unsafe { &mut *std::ptr::null_mut() },
         }
+
+        // notes: import CCX_DTVCC_MAX_SERVICES, initialize the decoders
     }
     /// Process cc data and add it to the dtvcc packet
     pub fn process_cc_data(&mut self, cc_valid: u8, cc_type: u8, data1: u8, data2: u8) {
@@ -212,10 +247,3 @@ impl dtvcc_symbol {
         is_true(self.init)
     }
 }
-
-impl Default for dtvcc_symbol {
-    /// Create a blank uninitialized symbol
-    fn default() -> Self {
-        Self { sym: 0, init: 0 }
-    }
-}

src/rust/src/decoder/tv_screen.rs

@@ -148,8 +148,8 @@ impl dtvcc_tv_screen {
         use_colors: bool,
     ) -> Result<(), String> {
         let mut buf = Vec::new();
-        let mut pen_color = dtvcc_pen_color::default();
-        let mut pen_attribs = dtvcc_pen_attribs::default();
+        let mut pen_color = dtvcc_pen_color::new();
+        let mut pen_attribs = dtvcc_pen_attribs::new();
         let (first, last) = self.get_write_interval(row_index);
         debug!("First: {}, Last: {}", first, last);
 
@@ -418,7 +418,7 @@ impl dtvcc_tv_screen {
             return;
         }
         let new_pen_attribs = if col_index >= CCX_DTVCC_SCREENGRID_COLUMNS as usize {
-            dtvcc_pen_attribs::default()
+            dtvcc_pen_attribs::new()
         } else {
             self.pen_attribs[row_index][col_index]
         };
@@ -455,7 +455,7 @@ impl dtvcc_tv_screen {
             return;
         }
         let new_pen_color = if col_index >= CCX_DTVCC_SCREENGRID_COLUMNS as usize {
-            dtvcc_pen_color::default()
+            dtvcc_pen_color::new()
         } else {
             self.pen_colors[row_index][col_index]
         };

src/rust/src/decoder/window.rs

@@ -149,9 +149,9 @@ impl dtvcc_window {
     /// Clear all text from the window
     pub fn clear_text(&mut self) {
         // Set pen color to default value
-        self.pen_color_pattern = dtvcc_pen_color::default();
+        self.pen_color_pattern = dtvcc_pen_color::new();
         // Set pen attributes to default value
-        self.pen_attribs_pattern = dtvcc_pen_attribs::default();
+        self.pen_attribs_pattern = dtvcc_pen_attribs::new();
         for row in 0..CCX_DTVCC_MAX_ROWS as usize {
             self.clear_row(row);
         }
@@ -521,9 +521,9 @@ enum Opacity {
     Transparent = 3,
 }
 
-impl Default for dtvcc_pen_color {
+impl dtvcc_pen_color {
     /// Returns the default pen color
-    fn default() -> Self {
+    pub fn new() -> Self {
         Self {
             fg_color: 0x3F,
             fg_opacity: 0,
@@ -534,9 +534,9 @@ impl Default for dtvcc_pen_color {
     }
 }
 
-impl Default for dtvcc_pen_attribs {
+impl dtvcc_pen_attribs {
     /// Returns the default pen attributes
-    fn default() -> Self {
+    pub fn new() -> Self {
         Self {
             pen_size: dtvcc_pen_size::DTVCC_PEN_SIZE_STANDART as i32,
             offset: 0,