Modifying lib_cc_decode (C) to use the new Dtvcc (Rust)

ArchitBhonsle · ArchitBhonsle · commit b84295232885 · 2023-03-17T23:22:01.000+05:30
diff --git a/src/lib_ccx/ccx_decoders_common.c b/src/lib_ccx/ccx_decoders_common.c
@@ -18,6 +18,8 @@ made to reuse, not duplicate, as many functions as possible */
 #ifndef DISABLE_RUST
 extern int ccxr_process_cc_data(struct lib_cc_decode *dec_ctx, unsigned char *cc_data, int cc_count);
 extern void ccxr_flush_decoder(struct dtvcc_ctx *dtvcc, struct dtvcc_service_decoder *decoder);
+extern void *ccxr_dtvcc_init(struct ccx_decoder_dtvcc_settings *decoder_settings);
+extern void ccxr_dtvcc_free(void *dtvcc_rust);
 #endif
 
 uint64_t utc_refvalue = UINT64_MAX; /* _UI64_MAX/UINT64_MAX means don't use UNIX, 0 = use current system time as reference, +1 use a specific reference */
@@ -232,6 +234,9 @@ int do_cb(struct lib_cc_decode *ctx, unsigned char *cc_block, struct cc_subtitle
 void dinit_cc_decode(struct lib_cc_decode **ctx)
 {
 	struct lib_cc_decode *lctx = *ctx;
+#ifndef DISABLE_RUST
+	ccxr_dtvcc_free(lctx->dtvcc_rust);
+#endif
 	dtvcc_free(&lctx->dtvcc);
 	dinit_avc(&lctx->avc_ctx);
 	ccx_decoder_608_dinit_library(&lctx->context_cc608_field_1);
@@ -261,6 +266,9 @@ struct lib_cc_decode *init_cc_decode(struct ccx_decoders_common_settings_t *sett
 	ctx->no_rollup = setting->no_rollup;
 	ctx->noscte20 = setting->noscte20;
 
+#ifndef DISABLE_RUST
+	ctx->dtvcc = ccxr_dtvcc_init(setting->settings_dtvcc);
+#endif
 	ctx->dtvcc = dtvcc_init(setting->settings_dtvcc);
 	ctx->dtvcc->is_active = setting->settings_dtvcc->enabled;
 
diff --git a/src/lib_ccx/ccx_decoders_structs.h b/src/lib_ccx/ccx_decoders_structs.h
@@ -11,11 +11,10 @@
 #define CCX_DECODER_608_SCREEN_ROWS 15
 #define CCX_DECODER_608_SCREEN_WIDTH 32
 #define MAXBFRAMES 50
-#define SORTBUF (2*MAXBFRAMES+1)
-
+#define SORTBUF (2 * MAXBFRAMES + 1)
 
 /* flag raised when end of display marker arrives in Dvb Subtitle */
-#define SUB_EOD_MARKER (1 << 0 )
+#define SUB_EOD_MARKER (1 << 0)
 struct cc_bitmap
 {
 	int x;
@@ -77,22 +76,22 @@ enum ccx_decoder_608_color_code
 };
 
 /**
-* This structure have fields which need to be ignored according to format,
-* for example if format is SFORMAT_XDS then all fields other then
-* xds related (xds_str, xds_len and  cur_xds_packet_class) should be
-* ignored and not to be dereferenced.
-*
-* TODO use union inside struct for each kind of fields
-*/
+ * This structure have fields which need to be ignored according to format,
+ * for example if format is SFORMAT_XDS then all fields other then
+ * xds related (xds_str, xds_len and  cur_xds_packet_class) should be
+ * ignored and not to be dereferenced.
+ *
+ * TODO use union inside struct for each kind of fields
+ */
 struct eia608_screen // A CC buffer
 {
 	/** format of data inside this structure */
 	enum ccx_eia608_format format;
 	unsigned char characters[CCX_DECODER_608_SCREEN_ROWS][CCX_DECODER_608_SCREEN_WIDTH + 1];
 	enum ccx_decoder_608_color_code colors[CCX_DECODER_608_SCREEN_ROWS][CCX_DECODER_608_SCREEN_WIDTH + 1];
 	enum font_bits fonts[CCX_DECODER_608_SCREEN_ROWS][CCX_DECODER_608_SCREEN_WIDTH + 1]; // Extra char at the end for a 0
-	int row_used[CCX_DECODER_608_SCREEN_ROWS];            // Any data in row?
-	int empty;                   // Buffer completely empty?
+	int row_used[CCX_DECODER_608_SCREEN_ROWS];					     // Any data in row?
+	int empty;									     // Buffer completely empty?
 	/** start time of this CC buffer */
 	LLONG start_time;
 	/** end time of this CC buffer */
@@ -110,20 +109,20 @@ struct eia608_screen // A CC buffer
 
 struct ccx_decoders_common_settings_t
 {
-	LLONG subs_delay;                                          // ms to delay (or advance) subs
-	enum ccx_output_format output_format;                      // What kind of output format should be used?
-	int fix_padding;                                           // Replace 0000 with 8080 in HDTV (needed for some cards)
+	LLONG subs_delay;					   // ms to delay (or advance) subs
+	enum ccx_output_format output_format;			   // What kind of output format should be used?
+	int fix_padding;					   // Replace 0000 with 8080 in HDTV (needed for some cards)
 	struct ccx_boundary_time extraction_start, extraction_end; // Segment we actually process
 	int cc_to_stdout;
-	int extract;                                               // Extract 1st, 2nd or both fields
-	int fullbin;                                               // Disable pruning of padding cc blocks
+	int extract; // Extract 1st, 2nd or both fields
+	int fullbin; // Disable pruning of padding cc blocks
 	int no_rollup;
 	int noscte20;
-	struct ccx_decoder_608_settings *settings_608;             // Contains the settings for the 608 decoder.
-	ccx_decoder_dtvcc_settings *settings_dtvcc;                // Same for cea 708 captions decoder (dtvcc)
-	int cc_channel;                                            // Channel we want to dump in srt mode
+	struct ccx_decoder_608_settings *settings_608; // Contains the settings for the 608 decoder.
+	ccx_decoder_dtvcc_settings *settings_dtvcc;    // Same for cea 708 captions decoder (dtvcc)
+	int cc_channel;				       // Channel we want to dump in srt mode
 	unsigned send_to_srv;
-	unsigned int hauppauge_mode;                               // If 1, use PID=1003, process specially and so on
+	unsigned int hauppauge_mode; // If 1, use PID=1003, process specially and so on
 	int program_number;
 	enum ccx_code_type codec;
 	int xds_write_to_file;
@@ -142,17 +141,17 @@ struct lib_cc_decode
 	void *context_cc608_field_1;
 	void *context_cc608_field_2;
 
-	int no_rollup;                                             // If 1, write one line at a time
+	int no_rollup; // If 1, write one line at a time
 	int noscte20;
-	int fix_padding;                                           // Replace 0000 with 8080 in HDTV (needed for some cards)
-	enum ccx_output_format write_format;                       // 0 = Raw, 1 = srt, 2 = SMI
+	int fix_padding;					   // Replace 0000 with 8080 in HDTV (needed for some cards)
+	enum ccx_output_format write_format;			   // 0 = Raw, 1 = srt, 2 = SMI
 	struct ccx_boundary_time extraction_start, extraction_end; // Segment we actually process
-	LLONG subs_delay;                                          // ms to delay (or advance) subs
-	int extract;                                               // Extract 1st, 2nd or both fields
-	int fullbin;                                               // Disable pruning of padding cc blocks
+	LLONG subs_delay;					   // ms to delay (or advance) subs
+	int extract;						   // Extract 1st, 2nd or both fields
+	int fullbin;						   // Disable pruning of padding cc blocks
 	struct cc_subtitle dec_sub;
 	enum ccx_bufferdata_type in_bufferdatatype;
-	unsigned int hauppauge_mode;                               // If 1, use PID=1003, process specially and so on
+	unsigned int hauppauge_mode; // If 1, use PID=1003, process specially and so on
 
 	int frames_since_last_gop;
 	/* GOP-based timing */
@@ -185,7 +184,7 @@ struct lib_cc_decode
 	int in_pic_data;
 
 	unsigned int current_progressive_sequence;
-	unsigned int current_pulldownfields ;
+	unsigned int current_pulldownfields;
 
 	int temporal_reference;
 	enum ccx_frame_type picture_coding_type;
@@ -197,17 +196,18 @@ struct lib_cc_decode
 	/* Required in es_function.c and es_userdata.c */
 	unsigned top_field_first; // Needs to be global
 
-    /* Stats. Modified in es_userdata.c*/
-    int stat_numuserheaders;
-    int stat_dvdccheaders;
-    int stat_scte20ccheaders;
-    int stat_replay5000headers;
-    int stat_replay4000headers;
-    int stat_dishheaders;
-    int stat_hdtv;
-    int stat_divicom;
-    int false_pict_header;
-
+	/* Stats. Modified in es_userdata.c*/
+	int stat_numuserheaders;
+	int stat_dvdccheaders;
+	int stat_scte20ccheaders;
+	int stat_replay5000headers;
+	int stat_replay4000headers;
+	int stat_dishheaders;
+	int stat_hdtv;
+	int stat_divicom;
+	int false_pict_header;
+
+	void *dtvcc_rust;
 	dtvcc_ctx *dtvcc;
 	int current_field;
 	// Analyse/use the picture information
@@ -217,7 +217,7 @@ struct lib_cc_decode
 	// Store fts;
 	LLONG cc_fts[SORTBUF];
 	// Store HD CC packets
-	unsigned char cc_data_pkts[SORTBUF][10*31*3+1]; // *10, because MP4 seems to have different limits
+	unsigned char cc_data_pkts[SORTBUF][10 * 31 * 3 + 1]; // *10, because MP4 seems to have different limits
 
 	// The sequence number of the current anchor frame.  All currently read
 	// B-Frames belong to this I- or P-frame.
@@ -227,7 +227,7 @@ struct lib_cc_decode
 
 	int (*writedata)(const unsigned char *data, int length, void *private_data, struct cc_subtitle *sub);
 
-	//dvb subtitle related
+	// dvb subtitle related
 	int ocr_quantmode;
 	struct lib_cc_decode *prev;
 };
diff --git a/src/rust/src/decoder/mod.rs b/src/rust/src/decoder/mod.rs
@@ -70,14 +70,14 @@ impl<'a> Dtvcc<'a> {
         // unlike C, here the decoders are allocated on the stack as an array.
         let decoders = {
             const INIT: Option<dtvcc_service_decoder> = None;
-            let val = [INIT; CCX_DTVCC_MAX_SERVICES];
+            let mut val = [INIT; CCX_DTVCC_MAX_SERVICES];
 
             for i in 0..CCX_DTVCC_MAX_SERVICES {
                 if is_false(opts.services_enabled[i]) {
                     continue;
                 }
 
-                let decoder = dtvcc_service_decoder {
+                let mut decoder = dtvcc_service_decoder {
                     // we cannot allocate this on the stack as `dtvcc_service_decoder` is a C
                     // struct cannot be changed trivially
                     tv: Box::into_raw(Box::new(dtvcc_tv_screen {
@@ -228,7 +228,7 @@ impl<'a> Dtvcc<'a> {
                 let decoder = &mut self.decoders[(service_number - 1) as usize];
                 decoder.unwrap().process_service_block(
                     &self.packet[pos as usize..(pos + block_length) as usize],
-                    self.encoder.unwrap(),
+                    self.encoder.as_mut().unwrap(),
                     self.timing,
                     self.no_rollup,
                 );
@@ -256,12 +256,12 @@ impl<'a> Drop for Dtvcc<'a> {
     fn drop(&mut self) {
         // closely follows `dtvcc_free` at `src/lib_ccx/ccx_dtvcc.c:126`
         for i in 0..CCX_DTVCC_MAX_SERVICES {
-            if let Some(decoder) = self.decoders[i] {
+            if let Some(mut decoder) = self.decoders[i] {
                 if !is_true(self.services_active[i]) {
                     continue;
                 }
 
-                decoder.windows.iter().for_each(|window| {
+                decoder.windows.iter_mut().for_each(|window| {
                     if is_false(window.memory_reserved) {
                         return;
                     }
diff --git a/src/rust/src/lib.rs b/src/rust/src/lib.rs
@@ -86,13 +86,11 @@ extern "C" fn ccxr_process_cc_data(
         .map(|x| unsafe { *data.add(x as usize) })
         .collect();
     let dec_ctx = unsafe { &mut *dec_ctx };
-    let dtvcc_ctx = unsafe { &mut *dec_ctx.dtvcc };
-    let mut dtvcc = Dtvcc::new(dtvcc_ctx);
     for cc_block in cc_data.chunks_exact_mut(3) {
         if !validate_cc_pair(cc_block) {
             continue;
         }
-        let success = do_cb(dec_ctx, &mut dtvcc, cc_block);
+        let success = do_cb(dec_ctx, cc_block);
         if success {
             ret = 0;
         }
@@ -136,7 +134,8 @@ pub fn verify_parity(data: u8) -> bool {
 }
 
 /// Process CC data according to its type
-pub fn do_cb(ctx: &mut lib_cc_decode, dtvcc: &mut Dtvcc, cc_block: &[u8]) -> bool {
+pub fn do_cb(ctx: &mut lib_cc_decode, cc_block: &[u8]) -> bool {
+    let dtvcc: &mut Dtvcc = unsafe { std::mem::transmute(ctx.dtvcc_rust) };
     let cc_valid = (cc_block[0] & 4) >> 2;
     let cc_type = cc_block[0] & 3;
     let mut timeok = true;
