fix(windows): Fix c_long ABI mismatch causing Windows CI failures

Author: cfsmp3

src/lib_ccx/asf_constants.h

@@ -53,7 +53,7 @@ typedef struct
 {
 	// Generic buffer to hold data
 	unsigned char *parsebuf;
-	long parsebufsize;
+	int64_t parsebufsize;
 	// Header Object variables
 	int64_t HeaderObjectSize;
 	int64_t FileSize;

src/lib_ccx/avc_functions.h

@@ -6,7 +6,7 @@ struct avc_ctx
 	unsigned char cc_count;
 	// buffer to hold cc data
 	unsigned char *cc_data;
-	long cc_databufsize;
+	int64_t cc_databufsize;
 	int cc_buffer_saved; // Was the CC buffer saved after it was last updated?
 
 	int is_hevc; // Flag to indicate HEVC (H.265) mode vs H.264
@@ -19,11 +19,11 @@ struct avc_ctx
 	int frame_mbs_only_flag;
 
 	// Use and throw stats for debug, remove this ugliness soon
-	long num_nal_unit_type_7;
-	long num_vcl_hrd;
-	long num_nal_hrd;
-	long num_jump_in_frames;
-	long num_unexpected_sei_length;
+	int64_t num_nal_unit_type_7;
+	int64_t num_vcl_hrd;
+	int64_t num_nal_hrd;
+	int64_t num_jump_in_frames;
+	int64_t num_unexpected_sei_length;
 
 	int ccblocks_in_avc_total;
 	int ccblocks_in_avc_lost;

src/lib_ccx/ccx_decoders_608.h

@@ -48,7 +48,7 @@ typedef struct ccx_decoder_608_context
 	int my_field;			// Used for sanity checks
 	int my_channel;			// Used for sanity checks
 	int rollup_from_popon;		// Track transition from pop-on/paint-on to roll-up mode
-	long bytes_processed_608;	// To be written ONLY by process_608
+	int64_t bytes_processed_608;	// To be written ONLY by process_608
 	int have_cursor_position;
 
 	int *halt;	  // Can be used to halt the feeding of caption data. Set to 1 if screens_to_progress != -1 && screenfuls_counter >= screens_to_process

src/lib_ccx/ccx_demuxer.h

@@ -57,9 +57,9 @@ struct cap_info
 	int program_number;
 	enum ccx_stream_type stream;
 	enum ccx_code_type codec;
-	long capbufsize;
+	int64_t capbufsize;
 	unsigned char *capbuf;
-	long capbuflen; // Bytes read in capbuf
+	int64_t capbuflen; // Bytes read in capbuf
 	int saw_pesstart;
 	int prev_counter;
 	void *codec_private_data;

src/lib_ccx/file_functions.c

@@ -2,7 +2,7 @@
 #include "ccx_common_option.h"
 #include "activity.h"
 #include "file_buffer.h"
-long FILEBUFFERSIZE = 1024 * 1024 * 16; // 16 Mbytes no less. Minimize number of real read calls()
+int64_t FILEBUFFERSIZE = 1024 * 1024 * 16; // 16 Mbytes no less. Minimize number of real read calls()
 
 #ifdef _WIN32
 WSADATA wsaData = {0};

src/lib_ccx/lib_ccx.h

@@ -237,7 +237,7 @@ int read_video_pes_header(struct ccx_demuxer *ctx, struct demuxer_data *data, un
 // ts_functions.c
 void init_ts(struct ccx_demuxer *ctx);
 int ts_readpacket(struct ccx_demuxer *ctx, struct ts_payload *payload);
-long ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data);
+int64_t ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data);
 int ts_get_more_data(struct lib_ccx_ctx *ctx, struct demuxer_data **data);
 int write_section(struct ccx_demuxer *ctx, struct ts_payload *payload, unsigned char *buf, int size, struct program_info *pinfo);
 void ts_buffer_psi_packet(struct ccx_demuxer *ctx);
@@ -294,7 +294,7 @@ extern int strangeheader;
 
 extern const char *desc[256];
 
-extern long FILEBUFFERSIZE; // Uppercase because it used to be a define
+extern int64_t FILEBUFFERSIZE; // Uppercase because it used to be a define
 
 extern int firstcall;
 

src/lib_ccx/ts_functions.c

@@ -754,7 +754,7 @@ uint64_t get_pts(uint8_t *buffer)
 // Threshold for enabling packet analysis mode when no PAT is found (in bytes)
 #define NO_PAT_THRESHOLD (188 * 1000) // After ~1000 packets
 
-long ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data)
+int64_t ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data)
 {
 	int gotpes = 0;
 	long pespcount = 0;	      // count packets in PES with captions

src/rust/src/common.rs

@@ -32,7 +32,7 @@ use lib_ccxr::time::units::Timestamp;
 use lib_ccxr::time::units::TimestampFormat;
 use lib_ccxr::util::encoding::Encoding;
 use lib_ccxr::util::log::{DebugMessageMask, OutputTarget};
-use std::os::raw::{c_int, c_long};
+use std::os::raw::c_int;
 use std::path::PathBuf;
 use std::str::FromStr;
 
@@ -996,9 +996,9 @@ impl CType<cap_info> for CapInfo {
             program_number: self.program_number,
             stream: self.stream.to_ctype() as ccx_stream_type, // CType<ccx_stream_type> for StreamType
             codec: self.codec.to_ctype(),                      // CType<ccx_code_type> for Codec
-            capbufsize: self.capbufsize as c_long,
+            capbufsize: self.capbufsize,
             capbuf: self.capbuf,
-            capbuflen: self.capbuflen as c_long,
+            capbuflen: self.capbuflen,
             saw_pesstart: self.saw_pesstart,
             prev_counter: self.prev_counter,
             codec_private_data: self.codec_private_data,

src/rust/src/libccxr_exports/demuxer.rs

@@ -9,7 +9,7 @@ use lib_ccxr::common::{Codec, Options, StreamMode, StreamType};
 use lib_ccxr::time::Timestamp;
 use std::alloc::{alloc_zeroed, Layout};
 use std::ffi::CStr;
-use std::os::raw::{c_char, c_int, c_long, c_longlong, c_uchar, c_uint, c_void};
+use std::os::raw::{c_char, c_int, c_uchar, c_uint, c_void};
 
 // External C function declarations
 extern "C" {
@@ -452,12 +452,12 @@ pub unsafe extern "C" fn ccxr_demuxer_open(ctx: *mut ccx_demuxer, file: *const c
 /// # Safety
 /// This function is unsafe because it dereferences a raw pointer.
 #[no_mangle]
-pub unsafe extern "C" fn ccxr_demuxer_get_file_size(ctx: *mut ccx_demuxer) -> c_longlong {
+pub unsafe extern "C" fn ccxr_demuxer_get_file_size(ctx: *mut ccx_demuxer) -> i64 {
     if ctx.is_null() {
         return -1;
     }
     let mut demux_ctx = copy_demuxer_from_c_to_rust(ctx);
-    demux_ctx.get_filesize() as c_longlong
+    demux_ctx.get_filesize() as i64
 }
 
 // Extern function for ccx_demuxer_print_cfg
@@ -482,7 +482,7 @@ use crate::demuxer::dvdraw::{is_dvdraw_header, parse_dvdraw_with_callbacks, FRAM
 // External C function declarations for caption processing
 extern "C" {
     fn do_cb(ctx: *mut lib_cc_decode, cc_block: *mut c_uchar, sub: *mut cc_subtitle) -> c_int;
-    fn ccxr_add_current_pts(ctx: *mut ccx_common_timing_ctx, pts: c_long);
+    fn ccxr_add_current_pts(ctx: *mut ccx_common_timing_ctx, pts: i64);
     fn ccxr_set_fts(ctx: *mut ccx_common_timing_ctx) -> c_int;
 }
 
@@ -546,7 +546,7 @@ pub unsafe extern "C" fn ccxr_process_dvdraw(
         },
         || {
             // Advance timing before each field 1 caption
-            ccxr_add_current_pts(timing_ctx, FRAME_DURATION_TICKS as c_long);
+            ccxr_add_current_pts(timing_ctx, FRAME_DURATION_TICKS);
             ccxr_set_fts(timing_ctx);
         },
     );