Merge branch 'master' into migration-timing-module

src/lib_ccx/ccx_encoders_helpers.c

@@ -13,13 +13,6 @@
 // userdefined rgb color
 unsigned char usercolor_rgb[8] = "";
 
-struct word_list
-{
-	char **words;
-	size_t len;
-	size_t capacity;
-};
-
 struct word_list capitalization_list = {
     .words = NULL,
     .len = 0,

src/lib_ccx/ccx_encoders_helpers.h

@@ -6,7 +6,6 @@
 #include "ccx_decoders_structs.h"
 #include "ccx_decoders_608.h"
 #include "ccx_encoders_common.h"
-#include <png.h>
 
 extern struct word_list capitalization_list;
 extern struct word_list profane;
@@ -15,6 +14,13 @@ extern const char *profane_builtin[];
 
 extern unsigned char usercolor_rgb[8];
 
+struct word_list
+{
+	char **words;
+	size_t len;
+	size_t capacity;
+};
+
 struct ccx_encoders_helpers_settings_t
 {
 	int trim_subs;
@@ -43,6 +49,4 @@ void shell_sort(void *base, int nb, size_t size, int (*compar)(const void *p1, c
 
 void ccx_encoders_helpers_perform_shellsort_words(void);
 void ccx_encoders_helpers_setup(enum ccx_encoding_type encoding, int no_font_color, int no_type_setting, int trim_subs);
-
-int mapclut_paletee(png_color *palette, png_byte *alpha, uint32_t *clut, uint8_t depth);
 #endif

src/lib_ccx/ccx_encoders_spupng.c

@@ -1,6 +1,6 @@
 #include "ccfont2.xbm" // CC font from libzvbi
 #include "ccx_common_common.h"
-#include "ccx_encoders_common.h"
+#include "ccx_encoders_spupng.h"
 #include <png.h>
 #include <ft2build.h>
 #include <math.h>

src/lib_ccx/ccx_encoders_spupng.h

@@ -0,0 +1,4 @@
+#include <png.h>
+#include "ccx_encoders_common.h"
+
+int mapclut_paletee(png_color *palette, png_byte *alpha, uint32_t *clut, uint8_t depth);

src/rust/build.rs

@@ -34,15 +34,12 @@ fn main() {
         "ccx_common_timing_settings_t",
         "ccx_s_options",
         "ccx_s_teletext_config",
-        "ccx_output_format",
-        "ccx_boundary_time",
         "ccx_output_date_format",
         "ccx_encoding_type",
-        "ccx_output_date_format",
         "ccx_decoder_608_settings",
         "ccx_decoder_608_report",
-        "ccx_output_format",
         "uint8_t",
+        "word_list",
     ]);
 
     #[cfg(feature = "hardsubx_ocr")]

src/rust/lib_ccxr/src/common/options.rs

@@ -639,3 +639,23 @@ impl Default for Options {
         }
     }
 }
+
+impl Options {
+    pub fn millis_separator(&self) -> char {
+        if self.ucla {
+            '.'
+        } else {
+            self.date_format.millis_separator()
+        }
+    }
+}
+
+impl EncoderConfig {
+    pub fn millis_separator(&self) -> char {
+        if self.ucla {
+            '.'
+        } else {
+            self.date_format.millis_separator()
+        }
+    }
+}

src/rust/src/common.rs

@@ -69,7 +69,7 @@ impl FromRust<Options> for ccx_s_options {
         self.settings_dtvcc = options.settings_dtvcc.to_ctype();
         self.is_608_enabled = options.is_608_enabled as _;
         self.is_708_enabled = options.is_708_enabled as _;
-        self.millis_separator = options.date_format.millis_separator() as _;
+        self.millis_separator = options.millis_separator() as _;
         self.binary_concat = options.binary_concat as _;
         self.use_gop_as_pts = if let Some(usegops) = options.use_gop_as_pts {
             if usegops {
@@ -257,7 +257,7 @@ impl CType2<ccx_s_teletext_config, &Options> for TeletextConfig {
             encoding: value.enc_cfg.encoding.to_ctype() as _,
             nofontcolor: self.nofontcolor.into(),
             nohtmlescape: self.nohtmlescape.into(),
-            millis_separator: self.date_format.millis_separator() as _,
+            millis_separator: value.millis_separator() as _,
             latrusmap: self.latrusmap.into(),
         };
         config.set_verbose(self.verbose.into());
@@ -571,7 +571,7 @@ impl CType<encoder_cfg> for EncoderConfig {
             ucla: self.ucla as _,
             encoding: self.encoding as _,
             date_format: self.date_format.to_ctype(),
-            millis_separator: self.date_format.millis_separator() as _,
+            millis_separator: self.millis_separator() as _,
             autodash: self.autodash as _,
             trim_subs: self.trim_subs as _,
             sentence_cap: self.sentence_cap as _,
@@ -625,3 +625,13 @@ impl CType<encoder_cfg> for EncoderConfig {
         }
     }
 }
+
+impl CType<word_list> for Vec<String> {
+    unsafe fn to_ctype(&self) -> word_list {
+        word_list {
+            words: string_to_c_chars(self.clone()),
+            len: self.len(),
+            capacity: self.capacity(),
+        }
+    }
+}

src/rust/src/lib.rs

@@ -28,7 +28,7 @@ use std::os::windows::io::{FromRawHandle, RawHandle};
 use args::Args;
 use bindings::*;
 use clap::{error::ErrorKind, Parser};
-use common::{CType2, FromRust};
+use common::{CType, CType2, FromRust};
 use decoder::Dtvcc;
 use lib_ccxr::{common::Options, teletext::TeletextConfig, util::log::ExitCause};
 use parser::OptionsExt;
@@ -72,6 +72,8 @@ extern "C" {
     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;
 }
 
 /// Initialize env logger with custom format, using stdout as target
@@ -265,22 +267,30 @@ pub unsafe extern "C" fn ccxr_parse_parameters(argc: c_int, argv: *mut *mut c_ch
         }
     };
 
-    let mut capitalization_list: Vec<String> = Vec::new();
-    let mut profane: Vec<String> = Vec::new();
+    let mut _capitalization_list: Vec<String> = Vec::new();
+    let mut _profane: Vec<String> = Vec::new();
 
     let mut opt = Options::default();
     let mut _tlt_config = TeletextConfig::default();
 
     opt.parse_parameters(
         &args,
         &mut _tlt_config,
-        &mut capitalization_list,
-        &mut profane,
+        &mut _capitalization_list,
+        &mut _profane,
     );
     tlt_config = _tlt_config.to_ctype(&opt);
+
     // Convert the rust struct (CcxOptions) to C struct (ccx_s_options), so that it can be used by the C code
     ccx_options.copy_from_rust(opt);
 
+    if !_capitalization_list.is_empty() {
+        capitalization_list = _capitalization_list.to_ctype();
+    }
+    if !_profane.is_empty() {
+        profane = _profane.to_ctype();
+    }
+
     ExitCause::Ok.exit_code()
 }
 

src/rust/src/parser.rs

@@ -1222,11 +1222,9 @@ impl OptionsExt for Options {
             tlt_config.page = Cell::new(TeletextPageNumber::from(tlt_config.user_page));
         }
 
-        let mut millis_separator = ',';
         // Red Hen/ UCLA Specific stuff
         if args.ucla {
             self.ucla = true;
-            millis_separator = '.';
             self.enc_cfg.no_bom = true;
 
             if !self.transcript_settings.is_final {
@@ -1291,11 +1289,15 @@ impl OptionsExt for Options {
         }
 
         if args.sects {
-            self.date_format = TimestampFormat::Seconds { millis_separator };
+            self.date_format = TimestampFormat::Seconds {
+                millis_separator: ',',
+            };
         }
 
         if args.datets {
-            self.date_format = TimestampFormat::Date { millis_separator };
+            self.date_format = TimestampFormat::Date {
+                millis_separator: ',',
+            };
         }
 
         if args.teletext {

src/rust/wrapper.h

@@ -10,3 +10,4 @@
 #include "../lib_ccx/lib_ccx.h"
 #include "../lib_ccx/hardsubx.h"
 #include "../lib_ccx/utility.h"
+#include "../lib_ccx/ccx_encoders_helpers.h"