some serious code refactoring

Author: vats004

src/lib_ccx/ccx_decoders_isdb.c

@@ -1,16 +1,30 @@
-
 #include "ccx_decoders_isdb.h"
 #include "lib_ccx.h"
 #include "utility.h"
 #include "limits.h"
 
 #ifndef DISABLE_RUST
 
-extern int ccxr_isdb_set_global_time(struct lib_cc_decode *dec_ctx, uint64_t timestamp);
-extern void ccxr_delete_isdb_decoder(void **isdb_ctx);
-extern void *ccxr_init_isdb_decoder(void);
-extern int ccxr_isdb_parse_data_group(void *codec_ctx, const uint8_t *buf, int size, struct cc_subtitle *sub);
-extern int ccxr_isdbsub_decode(struct lib_cc_decode *dec_ctx, const uint8_t *buf, size_t buf_size, struct cc_subtitle *sub);
+extern int ccxr_isdb_set_global_time(
+    struct lib_cc_decode *dec_ctx,
+    unsigned long long timestamp);
+
+extern void ccxr_delete_isdb_decoder(
+    void **isdb_ctx);
+
+extern struct ISDBSubContext *ccxr_init_isdb_decoder(
+    void);
+
+extern int ccxr_isdb_parse_data_group(
+    struct ISDBSubContext *codec_ctx,
+    const unsigned char *buf,
+    struct cc_subtitle *sub);
+
+extern int ccxr_isdbsub_decode(
+    struct lib_cc_decode *dec_ctx,
+    const unsigned char *buf,
+    size_t buf_len,
+    struct cc_subtitle *sub);
 
 #endif
 
@@ -487,6 +501,7 @@ static int ccx_strstr_ignorespace(const unsigned char *str1, const unsigned char
 	}
 	return 1;
 }
+
 /**
  * Copy data not more then len provided
  * User should check for return type to check how much data he has got
@@ -1347,7 +1362,7 @@ static int parse_caption_statement_data(ISDBSubContext *ctx, int lang_id, const
 int isdb_parse_data_group(void *codec_ctx, const uint8_t *buf, struct cc_subtitle *sub)
 {
 #ifndef DISABLE_RUST
-	return ccxr_isdb_parse_data_group(codec_ctx, buf, 0, sub);
+	return ccxr_isdb_parse_data_group(codec_ctx, buf, sub);
 #else
 	ISDBSubContext *ctx = codec_ctx;
 	const uint8_t *buf_pivot = buf;
@@ -1458,4 +1473,4 @@ int isdb_set_global_time(struct lib_cc_decode *dec_ctx, uint64_t timestamp)
 	ctx->timestamp = timestamp;
 	return CCX_OK;
 #endif
-}
+}

src/rust/Cargo.lock

@@ -27,14 +27,8 @@ time = "0.3.39"
 cfg-if = "1.0.0"
 num-integer = "0.1.46"
 lib_ccxr = { path = "lib_ccxr" }
-
 url = "2.5.4"
-libc = "0.2.169"
-nanomsg = { version = "0.7.2" }
-prost = "0.13.4"
-prost-types = "0.13.4"
-lazy_static = "1.5.0"
-nanomsg-sys = "0.7.2"
+
 
 [build-dependencies]
 bindgen = "0.64.0"
@@ -49,4 +43,4 @@ hardsubx_ocr = ["rsmpeg", "tesseract-sys", "leptonica-sys"]
 
 [profile.release-with-debug]
 inherits = "release"
-debug = true
+debug = true

src/rust/Cargo.toml

@@ -15,12 +15,8 @@ strum = "0.26.3"
 strum_macros = "0.26.4"
 crc32fast = "1.4.2"
 num_enum = "0.6.1"
-libc = "0.2.169"
-nanomsg = "0.7.2"
-prost = "0.13.4"
-prost-types = "0.13.4"
-lazy_static = "1.5.0"
-nanomsg-sys = "0.7.2"
+log = "0.4.26"
+env_logger = "0.8.4"
 
 [features]
 default = [
@@ -35,6 +31,4 @@ wtv_debug = []
 enable_ffmpeg = []
 debug_out = []
 debug = []
-with_libcurl = []
-
-
+with_libcurl = []

src/rust/lib_ccxr/Cargo.toml

@@ -0,0 +1,56 @@
+// Status codes
+pub const CCX_OK: i64 = 0;
+pub const CCX_FALSE: i64 = 0;
+pub const CCX_TRUE: i64 = 1;
+pub const CCX_EAGAIN: i64 = -100;
+pub const CCX_EOF: i64 = -101;
+pub const CCX_EINVAL: i64 = -102;
+pub const CCX_ENOSUPP: i64 = -103;
+pub const CCX_ENOMEM: i64 = -104;
+
+pub const NUM_BYTES_PER_PACKET: i64 = 35; // Class + type (repeated for convenience) + data + zero
+pub const NUM_XDS_BUFFERS: i64 = 35; // CEA recommends no more than one level of interleaving. Play it safe
+
+pub const MAXBFRAMES: usize = 50;
+pub const SORTBUF: usize = 2 * MAXBFRAMES + 1;
+
+// Time at which we switched to XDS mode, -1 means it hasn't happened yet
+pub const TS_START_OF_XDS: i64 = -1;
+
+// Exit codes
+pub const EXIT_OK: i64 = 0;
+pub const EXIT_NO_INPUT_FILES: i64 = 2;
+pub const EXIT_TOO_MANY_INPUT_FILES: i64 = 3;
+pub const EXIT_INCOMPATIBLE_PARAMETERS: i64 = 4;
+pub const EXIT_UNABLE_TO_DETERMINE_FILE_SIZE: i64 = 6;
+pub const EXIT_MALFORMED_PARAMETER: i64 = 7;
+pub const EXIT_READ_ERROR: i64 = 8;
+pub const EXIT_NO_CAPTIONS: i64 = 10;
+pub const EXIT_WITH_HELP: i64 = 11;
+pub const EXIT_NOT_CLASSIFIED: i64 = 300;
+pub const EXIT_ERROR_IN_CAPITALIZATION_FILE: i64 = 501;
+pub const EXIT_BUFFER_FULL: i64 = 502;
+pub const EXIT_MISSING_ASF_HEADER: i64 = 1001;
+pub const EXIT_MISSING_RCWT_HEADER: i64 = 1002;
+
+// Common exit codes
+pub const CCX_COMMON_EXIT_FILE_CREATION_FAILED: i64 = 5;
+pub const CCX_COMMON_EXIT_UNSUPPORTED: i64 = 9;
+pub const EXIT_NOT_ENOUGH_MEMORY: i64 = 500;
+pub const CCX_COMMON_EXIT_BUG_BUG: i64 = 1000;
+
+// Define max width in characters/columns on the screen
+pub const CCX_DECODER_608_SCREEN_ROWS: usize = 15;
+pub const CCX_DECODER_608_SCREEN_WIDTH: usize = 32;
+
+//isdb specific codes
+pub const CCX_DTVCC_MAX_SERVICES: usize = 63;
+pub const CCX_DTVCC_MAX_WINDOWS: usize = 8;
+pub const CCX_DTVCC_MAX_ROWS: usize = 15;
+pub const CCX_DTVCC_SCREENGRID_COLUMNS: usize = 210;
+pub const CCX_DTVCC_MAX_PACKET_LENGTH: usize = 128;
+pub const CCX_DTVCC_SCREENGRID_ROWS: usize = 75;
+
+pub const CCX_MESSAGES_QUIET: i32 = 0;
+pub const CCX_MESSAGES_STDOUT: i32 = 1;
+pub const CCX_MESSAGES_STDERR: i32 = 2;