some serious code refactoring (#6)

Co-authored-by: vats004 <=>

Author: vatsalkeshav

src/lib_ccx/ccx_decoders_xds.c

@@ -5,75 +5,23 @@
 #include "utility.h"
 
 #ifndef DISABLE_RUST
-
-extern struct ccx_decoders_xds_context *ccxr_ccx_decoders_xds_init_library(
-    struct ccx_common_timing_ctx timing,
-    int xds_write_to_file);
-
-extern int ccxr_write_xds_string(
-    struct cc_subtitle *sub,
-    struct ccx_decoders_xds_context *ctx,
-    const char *p,
-    size_t len);
-
-extern void ccxr_xdsprint(
-    struct cc_subtitle *sub,
-    struct ccx_decoders_xds_context *ctx,
-    const char *_fmt,
-    va_list args);
-
-extern void ccxr_clear_xds_buffer(
-    struct ccx_decoders_xds_context *ctx,
-    int64_t num);
-
-extern int64_t ccxr_how_many_used(
-    const struct ccx_decoders_xds_context *ctx);
-
 extern void ccxr_process_xds_bytes(
     struct ccx_decoders_xds_context *ctx,
-    uint8_t hi,
-    int64_t lo);
-
-extern void ccxr_xds_do_copy_generation_management_system(
-    struct cc_subtitle *sub,
-    struct ccx_decoders_xds_context *ctx,
-    uint8_t c1,
-    uint8_t c2);
-
-extern void ccxr_xds_do_content_advisory(
-    struct cc_subtitle *sub,
-    struct ccx_decoders_xds_context *ctx,
-    uint8_t c1,
-    uint8_t c2);
-
-extern int64_t ccxr_xds_do_private_data(
-    struct cc_subtitle *sub,
-    struct ccx_decoders_xds_context *ctx);
-
-extern int64_t ccxr_xds_do_misc(
-    const struct ccx_decoders_xds_context *ctx);
-
-extern int64_t ccxr_xds_do_current_and_future(
-    struct cc_subtitle *sub,
-    struct ccx_decoders_xds_context *ctx);
+    unsigned char hi,
+    unsigned char lo);
 
 extern void ccxr_do_end_of_xds(
     struct cc_subtitle *sub,
     struct ccx_decoders_xds_context *ctx,
-    int64_t expected_checksum);
-
-extern int64_t ccxr_xds_do_channel(
-    struct cc_subtitle *sub,
-    struct ccx_decoders_xds_context *ctx);
+    unsigned char expected_checksum);
 
-extern void ccxr_xds_debug_test(
-    struct ccx_decoders_xds_context *ctx,
-    struct cc_subtitle *sub);
+extern struct ccx_decoders_xds_context *ccxr_ccx_decoders_xds_init_library(
+    struct ccx_common_timing_ctx *timing,
+    int xds_write_to_file);
 
 extern void ccxr_xds_cea608_test(
     struct ccx_decoders_xds_context *ctx,
     struct cc_subtitle *sub);
-
 #endif
 
 LLONG ts_start_of_xds = -1; // Time at which we switched to XDS mode, =-1 hasn't happened yet
@@ -153,7 +101,7 @@ static const char *XDSProgramTypes[] =
 struct ccx_decoders_xds_context *ccx_decoders_xds_init_library(struct ccx_common_timing_ctx *timing, int xds_write_to_file)
 {
 #ifndef DISABLE_RUST
-	return ccxr_ccx_decoders_xds_init_library(*timing, xds_write_to_file);
+	return ccxr_ccx_decoders_xds_init_library(timing, xds_write_to_file); // Use the Rust implementation
 #else
 	int i;
 	struct ccx_decoders_xds_context *ctx = NULL;
@@ -201,9 +149,6 @@ struct ccx_decoders_xds_context *ccx_decoders_xds_init_library(struct ccx_common
 
 int write_xds_string(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx, char *p, size_t len)
 {
-#ifndef DISABLE_RUST
-	return ccxr_write_xds_string(sub, ctx, p, len);
-#else
 	struct eia608_screen *data = NULL;
 	data = (struct eia608_screen *)realloc(sub->data, (sub->nb_data + 1) * sizeof(*data));
 	if (!data)
@@ -217,31 +162,25 @@ int write_xds_string(struct cc_subtitle *sub, struct ccx_decoders_xds_context *c
 	{
 		sub->data = data;
 		sub->datatype = CC_DATATYPE_GENERIC;
+
 		data = (struct eia608_screen *)sub->data + sub->nb_data;
 		data->format = SFORMAT_XDS;
 		data->start_time = ts_start_of_xds;
 		data->end_time = get_fts(ctx->timing, 2);
 		data->xds_str = p;
 		data->xds_len = len;
 		data->cur_xds_packet_class = ctx->cur_xds_packet_class;
+
 		sub->nb_data++;
 		sub->type = CC_608;
 		sub->got_output = 1;
 	}
 
 	return 0;
-#endif
 }
 
 void xdsprint(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx, const char *fmt, ...)
 {
-#ifndef DISABLE_RUST
-	va_list ap;
-	va_start(ap, fmt);
-	ccxr_xdsprint(sub, ctx, fmt, ap);
-	va_end(ap);
-#else
-
 	if (!ctx->xds_write_to_file)
 		return;
 	/* Guess we need no more than 100 bytes. */
@@ -279,24 +218,19 @@ void xdsprint(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx, con
 			p = np;
 		}
 	}
-#endif
 }
 
 void xds_debug_test(struct ccx_decoders_xds_context *ctx, struct cc_subtitle *sub)
 {
-#ifndef DISABLE_RUST
-	ccxr_xds_debug_test(ctx, sub);
-#else
 	process_xds_bytes(ctx, 0x05, 0x02);
 	process_xds_bytes(ctx, 0x20, 0x20);
 	do_end_of_xds(sub, ctx, 0x2a);
-#endif
 }
 
 void xds_cea608_test(struct ccx_decoders_xds_context *ctx, struct cc_subtitle *sub)
 {
 #ifndef DISABLE_RUST
-	ccxr_xds_cea608_test(ctx, sub);
+	return ccxr_xds_cea608_test(ctx, sub);
 #else
 	/* This test is the sample data that comes in CEA-608. It sets the program name
 	   to be "Star Trek". The checksum is 0x1d and the validation must succeed. */
@@ -314,34 +248,26 @@ void xds_cea608_test(struct ccx_decoders_xds_context *ctx, struct cc_subtitle *s
 
 int how_many_used(struct ccx_decoders_xds_context *ctx)
 {
-#ifndef DISABLE_RUST
-	ccxr_how_many_used(ctx);
-#else
 	int c = 0;
 	for (int i = 0; i < NUM_XDS_BUFFERS; i++)
 		if (ctx->xds_buffers[i].in_use)
 			c++;
 	return c;
-#endif
 }
 
 void clear_xds_buffer(struct ccx_decoders_xds_context *ctx, int num)
 {
-#ifndef DISABLE_RUST
-	ccxr_clear_xds_buffer(ctx, num);
-#else
 	ctx->xds_buffers[num].in_use = 0;
 	ctx->xds_buffers[num].xds_class = -1;
 	ctx->xds_buffers[num].xds_type = -1;
 	ctx->xds_buffers[num].used_bytes = 0;
 	memset(ctx->xds_buffers[num].bytes, 0, NUM_BYTES_PER_PACKET);
-#endif
 }
 
 void process_xds_bytes(struct ccx_decoders_xds_context *ctx, const unsigned char hi, int lo)
 {
 #ifndef DISABLE_RUST
-	ccxr_process_xds_bytes(ctx, hi, lo);
+	return ccxr_process_xds_bytes(ctx, hi, lo); // Use the Rust implementation
 #else
 	int is_new;
 	if (!ctx)
@@ -420,9 +346,6 @@ void process_xds_bytes(struct ccx_decoders_xds_context *ctx, const unsigned char
  */
 void xds_do_copy_generation_management_system(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx, unsigned c1, unsigned c2)
 {
-#ifndef DISABLE_RUST
-	ccxr_xds_do_copy_generation_management_system(sub, ctx, c1, c2);
-#else
 	static unsigned last_c1 = -1, last_c2 = -1;
 	static char copy_permited[256];
 	static char aps[256];
@@ -476,14 +399,10 @@ void xds_do_copy_generation_management_system(struct cc_subtitle *sub, struct cc
 	ccx_common_logging.debug_ftn(CCX_DMT_DECODER_XDS, "\rXDS: %s\n", copy_permited);
 	ccx_common_logging.debug_ftn(CCX_DMT_DECODER_XDS, "\rXDS: %s\n", aps);
 	ccx_common_logging.debug_ftn(CCX_DMT_DECODER_XDS, "\rXDS: %s\n", rcd);
-#endif
 }
 
 void xds_do_content_advisory(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx, unsigned c1, unsigned c2)
 {
-#ifndef DISABLE_RUST
-	ccxr_xds_do_content_advisory(sub, ctx, c1, c2);
-#else
 	static unsigned last_c1 = -1, last_c2 = -1;
 	static char age[256];
 	static char content[256];
@@ -593,14 +512,10 @@ void xds_do_content_advisory(struct cc_subtitle *sub, struct ccx_decoders_xds_co
 
 	if (changed && !supported)
 		ccx_common_logging.log_ftn("XDS: Unsupported ContentAdvisory encoding, please submit sample.\n");
-#endif
 }
 
 int xds_do_current_and_future(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx)
 {
-#ifndef DISABLE_RUST
-	ccxr_xds_do_current_and_future(sub, ctx);
-#else
 	int was_proc = 0;
 
 	char *str = malloc(1024);
@@ -847,14 +762,10 @@ int xds_do_current_and_future(struct cc_subtitle *sub, struct ccx_decoders_xds_c
 
 	free(str);
 	return was_proc;
-#endif
 }
 
 int xds_do_channel(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx)
 {
-#ifndef DISABLE_RUST
-	ccxr_xds_do_channel(sub, ctx);
-#else
 	int was_proc = 0;
 	if (!ctx)
 		return CCX_EINVAL;
@@ -914,14 +825,10 @@ int xds_do_channel(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx
 			break;
 	}
 	return was_proc;
-#endif
 }
 
 int xds_do_private_data(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx)
 {
-#ifndef DISABLE_RUST
-	ccxr_xds_do_private_data(sub, ctx);
-#else
 	char *str;
 	int i;
 
@@ -938,14 +845,10 @@ int xds_do_private_data(struct cc_subtitle *sub, struct ccx_decoders_xds_context
 	xdsprint(sub, ctx, str);
 	free(str);
 	return 1;
-#endif
 }
 
 int xds_do_misc(struct ccx_decoders_xds_context *ctx)
 {
-#ifndef DISABLE_RUST
-	ccxr_xds_do_misc(ctx);
-#else
 	int was_proc = 0;
 	if (!ctx)
 		return CCX_EINVAL;
@@ -985,13 +888,12 @@ int xds_do_misc(struct ccx_decoders_xds_context *ctx)
 			break;
 	}
 	return was_proc;
-#endif
 }
 
 void do_end_of_xds(struct cc_subtitle *sub, struct ccx_decoders_xds_context *ctx, unsigned char expected_checksum)
 {
 #ifndef DISABLE_RUST
-	ccxr_do_end_of_xds(sub, ctx, expected_checksum);
+	return ccxr_do_end_of_xds(sub, ctx, expected_checksum);
 #else
 
 	int cs = 0;

src/lib_ccx/ccx_decoders_xds.h

@@ -12,7 +12,7 @@ void do_end_of_xds (struct cc_subtitle *sub, struct ccx_decoders_xds_context *ct
 
 struct ccx_decoders_xds_context *ccx_decoders_xds_init_library(struct ccx_common_timing_ctx *timing, int xds_write_to_file);
 
-void xds_cea608_test();
+void xds_cea608_test(struct ccx_decoders_xds_context *ctx, struct cc_subtitle *sub);
 
 struct xds_buffer
 {

src/rust/lib_ccxr/src/decoder_xds/exit_codes.rs

@@ -0,0 +1,43 @@
+// codes for do_end_of_xds
+pub const XDS_CLASS_FUTURE: i64 = 1;
+pub const XDS_CLASS_CHANNEL: i64 = 2;
+pub const XDS_CLASS_MISC: i64 = 3;
+pub const XDS_CLASS_PRIVATE: i64 = 6;
+pub const XDS_CLASS_OUT_OF_BAND: i64 = 0x40;
+
+// codes for xds_do_misc
+pub const XDS_TYPE_TIME_OF_DAY: i64 = 1;
+pub const XDS_TYPE_LOCAL_TIME_ZONE: i64 = 4;
+
+// codes for xds_do_channel
+pub const XDS_TYPE_NETWORK_NAME: i64 = 1;
+pub const XDS_TYPE_CALL_LETTERS_AND_CHANNEL: i64 = 2;
+pub const XDS_TYPE_TSID: i64 = 4;
+
+// codes for xds_do_current_and_future
+pub const XDS_CLASS_CURRENT: i64 = 0;
+
+pub const XDS_TYPE_PIN_START_TIME: i64 = 1;
+pub const XDS_TYPE_LENGTH_AND_CURRENT_TIME: i64 = 2;
+pub const XDS_TYPE_PROGRAM_NAME: i64 = 3;
+pub const XDS_TYPE_PROGRAM_TYPE: i64 = 4;
+pub const XDS_TYPE_CONTENT_ADVISORY: i64 = 5;
+pub const XDS_TYPE_AUDIO_SERVICES: i64 = 6;
+pub const XDS_TYPE_CGMS: i64 = 8;
+pub const XDS_TYPE_ASPECT_RATIO_INFO: i64 = 9;
+
+pub const XDS_TYPE_PROGRAM_DESC_1: i64 = 0x10;
+pub const XDS_TYPE_PROGRAM_DESC_8: i64 = 0x17;
+
+// codes for write_xds_string
+pub const TS_START_OF_XDS: i64 = -1; // Time at which we switched to XDS mode, =-1 hasn't happened yet
+
+// codes for Eia608Screen::default
+pub const CCX_DECODER_608_SCREEN_ROWS: usize = 15;
+pub const CCX_DECODER_608_SCREEN_WIDTH: usize = 32;
+
+// codes for CcxDecodersXdsContext::default
+pub const NUM_XDS_BUFFERS: usize = 9;
+
+// codes for XdsBuffer::default
+pub const NUM_BYTES_PER_PACKET: usize = 35;