Rust updates:- Add writers for transcripts and SAMI (#1372)

* add rust-iconv

* Add writer for transcipts and SAMI

* consistent import ordering

Author: PunitLodha

src/rust/Cargo.lock

@@ -13,6 +13,7 @@ crate-type = ["cdylib"]
 [dependencies]
 log = "0.4.0"
 env_logger = "0.8.4"
+iconv = "0.1.1"
 
 [build-dependencies]
 bindgen = "0.58.1"

src/rust/Cargo.toml

@@ -44,4 +44,4 @@ const ALLOWLIST_FUNCTIONS: &[&str] = &[
     "writercwtdata",
 ];
 const ALLOWLIST_TYPES: &[&str] = &[".*(?i)_?dtvcc_.*", "encoder_ctx", "lib_cc_decode"];
-const RUSTIFIED_ENUMS: &[&str] = &["dtvcc_(window|pen)_.*"];
+const RUSTIFIED_ENUMS: &[&str] = &["dtvcc_(window|pen)_.*", "ccx_output_format"];

src/rust/build.rs

@@ -9,10 +9,10 @@ mod timing;
 mod tv_screen;
 mod window;
 
-use log::{debug, warn};
-
 use crate::{bindings::*, utils::is_true};
 
+use log::{debug, warn};
+
 const CCX_DTVCC_MAX_PACKET_LENGTH: u8 = 128;
 const CCX_DTVCC_NO_LAST_SEQUENCE: i32 = -1;
 const CCX_DTVCC_SCREENGRID_ROWS: u8 = 75;

src/rust/src/decoder/mod.rs

@@ -1,33 +1,36 @@
+#[cfg(windows)]
+use std::os::windows::io::{FromRawHandle, IntoRawHandle, RawHandle};
 use std::{
     fs::File,
     io::Write,
     os::unix::prelude::{FromRawFd, IntoRawFd},
 };
 
-use log::debug;
-
-#[cfg(windows)]
-use std::os::windows::io::{FromRawHandle, IntoRawHandle, RawHandle};
-
 use crate::{bindings::*, utils::is_true};
 
+use log::debug;
+
 // Context for writing subtitles to file
 pub struct Writer<'a> {
     pub cea_708_counter: &'a mut u32,
     pub subs_delay: LLONG,
     pub crlf: String,
-    pub write_format: u32,
+    pub write_format: ccx_output_format,
     pub writer_ctx: &'a mut dtvcc_writer_ctx,
     pub no_font_color: bool,
+    pub transcript_settings: &'a ccx_encoders_transcript_format,
+    pub no_bom: i32,
 }
 
 impl<'a> Writer<'a> {
     pub fn new(
         cea_708_counter: &'a mut u32,
         subs_delay: LLONG,
-        write_format: u32,
+        write_format: ccx_output_format,
         writer_ctx: &'a mut dtvcc_writer_ctx,
         no_font_color: i32,
+        transcript_settings: &'a ccx_encoders_transcript_format,
+        no_bom: i32,
     ) -> Self {
         Self {
             cea_708_counter,
@@ -36,17 +39,31 @@ impl<'a> Writer<'a> {
             write_format,
             writer_ctx,
             no_font_color: is_true(no_font_color),
+            transcript_settings,
+            no_bom,
         }
     }
+    pub fn write_to_file(&mut self, buf: &[u8]) -> Result<(), String> {
+        #[cfg(unix)]
+        {
+            let mut file = unsafe { File::from_raw_fd(self.writer_ctx.fd) };
+            file.write_all(buf).map_err(|err| err.to_string())?;
+            self.writer_ctx.fd = file.into_raw_fd();
+        }
+        #[cfg(windows)]
+        {
+            let mut file = unsafe { File::from_raw_handle(self.writer_ctx.fhandle) };
+            file.write_all(buf).map_err(|err| err.to_string())?;
+            self.writer_ctx.fhandle = file.into_raw_handle();
+        }
+        Ok(())
+    }
 }
 
 pub fn write_char(sym: &dtvcc_symbol, buf: &mut Vec<u8>) {
     if sym.sym >> 8 != 0 {
         buf.push((sym.sym >> 8) as u8);
         buf.push((sym.sym & 0xff) as u8);
-        for x in buf.iter().rev().take(2) {
-            println!("Chars:- {:02X}", x);
-        }
     } else {
         buf.push(sym.sym as u8);
     }
@@ -62,19 +79,3 @@ pub fn color_to_hex(color: u8) -> (u8, u8, u8) {
     );
     (red, green, blue)
 }
-
-pub fn write_to_file(writer: &mut Writer, buf: &[u8]) -> std::io::Result<()> {
-    #[cfg(unix)]
-    {
-        let mut file = unsafe { File::from_raw_fd(writer.writer_ctx.fd) };
-        file.write_all(buf)?;
-        writer.writer_ctx.fd = file.into_raw_fd();
-    }
-    #[cfg(windows)]
-    {
-        let mut file = unsafe { File::from_raw_handle(writer.writer_ctx.fhandle) };
-        file.write_all(buf)?;
-        writer.writer_ctx.fhandle = file.into_raw_handle();
-    }
-    Ok(())
-}

src/rust/src/decoder/output.rs

@@ -3,11 +3,9 @@ use std::{
     os::raw::c_uchar,
 };
 
-use log::{debug, error, warn};
-
+use super::commands::{self, C0CodeSet, C0Command, C1CodeSet, C1Command};
+use super::window::{PenPreset, WindowPreset};
 use super::{
-    commands::{self, C0CodeSet, C0Command, C1CodeSet, C1Command},
-    window::{PenPreset, WindowPreset},
     CCX_DTVCC_MAX_COLUMNS, CCX_DTVCC_MAX_ROWS, CCX_DTVCC_SCREENGRID_COLUMNS,
     CCX_DTVCC_SCREENGRID_ROWS,
 };
@@ -17,6 +15,8 @@ use crate::{
     utils::{is_false, is_true},
 };
 
+use log::{debug, error, warn};
+
 const CCX_DTVCC_MUSICAL_NOTE_CHAR: u16 = 9836;
 const CCX_DTVCC_MAX_WINDOWS: u8 = 8;
 const DTVCC_COMMANDS_C0_CODES_DTVCC_C0_EXT1: u8 = 16;
@@ -949,6 +949,8 @@ impl dtvcc_service_decoder {
                 encoder.write_format,
                 writer_ctx,
                 encoder.no_font_color,
+                &*encoder.transcript_settings,
+                encoder.no_bom,
             );
             tv.writer_output(&mut writer).unwrap();
             tv.clear();