made Demuxer and File Functions

Author: steel-bucket

linux/ut=report

@@ -201,7 +201,7 @@ int api_start(struct ccx_s_options api_options)
 					api_options.use_gop_as_pts = 0;
 				if (api_options.ignore_pts_jumps)
 					ccx_common_timing_settings.disable_sync_check = 1;
-				mprint("\rAnalyzing data in general mode\n");
+				mprint("\r\n Analyzing data in general mode\n");
 				tmp = general_loop(ctx);
 				if (!ret)
 					ret = tmp;

src/ccextractor.c

@@ -9,16 +9,14 @@ void ccxr_demuxer_close(struct ccx_demuxer *ctx);
 int ccxr_demuxer_isopen(const struct ccx_demuxer *ctx);
 int ccxr_demuxer_open(struct ccx_demuxer *ctx, const char *file);
 LLONG ccxr_demuxer_get_file_size(struct ccx_demuxer *ctx);
-int ccxr_demuxer_get_stream_mode(const struct ccx_demuxer *ctx);
 void ccxr_demuxer_print_cfg(const struct ccx_demuxer *ctx);
-void ccxr_demuxer_delete(struct ccx_demuxer **ctx);
 #endif
 
 static void ccx_demuxer_reset(struct ccx_demuxer *ctx)
 {
-// #ifndef DISABLE_RUST
-// 	ccxr_demuxer_reset(ctx);
-// #else
+#ifndef DISABLE_RUST
+	ccxr_demuxer_reset(ctx);
+#else
 	ctx->startbytes_pos = 0;
 	ctx->startbytes_avail = 0;
 	ctx->num_of_PIDs = 0;
@@ -30,39 +28,38 @@ static void ccx_demuxer_reset(struct ccx_demuxer *ctx)
 	}
 	memset(ctx->stream_id_of_each_pid, 0, (MAX_PSI_PID + 1) * sizeof(uint8_t));
 	memset(ctx->PIDs_programs, 0, 65536 * sizeof(struct PMT_entry *));
-// #endif
+#endif
 }
 
 static void ccx_demuxer_close(struct ccx_demuxer *ctx)
 {
-// #ifndef DISABLE_RUST
-// 	ccxr_demuxer_close(ctx);
-// 	mprint("ctx.past = %lld\n", ctx->past);
-// 	mprint("ctx.infd = %lld\n", ctx->infd);
-// #else
+#ifndef DISABLE_RUST
+	ccxr_demuxer_close(ctx);
+#else
 	ctx->past = 0;
 	if (ctx->infd != -1 && ccx_options.input_source == CCX_DS_FILE)
 	{
 		close(ctx->infd);
 		ctx->infd = -1;
 		activity_input_file_closed();
 	}
-// #endif
+#endif
 }
 
 static int ccx_demuxer_isopen(struct ccx_demuxer *ctx)
 {
-// #ifndef DISABLE_RUST
-// 	return ccxr_demuxer_isopen(ctx);
-// #else
+#ifndef DISABLE_RUST
+	return ccxr_demuxer_isopen(ctx);
+#else
 	return ctx->infd != -1;
-// #endif
+#endif
 }
+
 static int ccx_demuxer_open(struct ccx_demuxer *ctx, const char *file)
 {
-// #ifndef DISABLE_RUST
-// 	return ccxr_demuxer_open(ctx, file);
-// #else
+#ifndef DISABLE_RUST
+	return ccxr_demuxer_open(ctx, file);
+#else
 	ctx->past = 0;
 	ctx->min_global_timestamp = 0;
 	ctx->global_timestamp_inited = 0;
@@ -220,13 +217,14 @@ static int ccx_demuxer_open(struct ccx_demuxer *ctx, const char *file)
 	}
 
 	return 0;
-// #endif
+#endif
 }
+
 LLONG ccx_demuxer_get_file_size(struct ccx_demuxer *ctx)
 {
-// #ifndef DISABLE_RUST
-// 	return ccxr_demuxer_get_file_size(ctx);
-// #else
+#ifndef DISABLE_RUST
+	return ccxr_demuxer_get_file_size(ctx);
+#else
 	LLONG ret = 0;
 	int in = ctx->infd;
 	LLONG current = LSEEK(in, 0, SEEK_CUR);
@@ -239,23 +237,19 @@ LLONG ccx_demuxer_get_file_size(struct ccx_demuxer *ctx)
 		return -1;
 
 	return length;
-// #endif
+#endif
 }
 
 static int ccx_demuxer_get_stream_mode(struct ccx_demuxer *ctx)
 {
-// #ifndef DISABLE_RUST
-// 	return ccxr_demuxer_get_stream_mode(ctx);
-// #else
 	return ctx->stream_mode;
-// #endif
 }
 
 static void ccx_demuxer_print_cfg(struct ccx_demuxer *ctx)
 {
-// #ifndef DISABLE_RUST
-// 	ccxr_demuxer_print_cfg(ctx);
-// #else
+	#ifndef DISABLE_RUST
+		ccxr_demuxer_print_cfg(ctx);
+	#else
 	switch (ctx->auto_stream)
 	{
 		case CCX_SM_ELEMENTARY_OR_NOT_FOUND:
@@ -300,14 +294,11 @@ static void ccx_demuxer_print_cfg(struct ccx_demuxer *ctx)
 			fatal(CCX_COMMON_EXIT_BUG_BUG, "BUG: Unknown stream mode. Please file a bug report on Github.\n");
 			break;
 	}
-// #endif
+	#endif
 }
 
 void ccx_demuxer_delete(struct ccx_demuxer **ctx)
 {
-// #ifndef DISABLE_RUST
-// 	ccxr_demuxer_delete(ctx);
-// #else
 	struct ccx_demuxer *lctx = *ctx;
 	int i;
 	dinit_cap(lctx);
@@ -330,7 +321,6 @@ void ccx_demuxer_delete(struct ccx_demuxer **ctx)
 
 	freep(&lctx->filebuffer);
 	freep(ctx);
-// #endif
 }
 
 struct ccx_demuxer *init_demuxer(void *parent, struct demuxer_cfg *cfg)
@@ -451,4 +441,4 @@ struct demuxer_data *alloc_demuxer_data(void)
 	data->next_stream = 0;
 	data->next_program = 0;
 	return data;
-}
+}

src/lib_ccx/ccx_demuxer.c

@@ -14,13 +14,7 @@
 #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y)))
 #define IS_KLV_KEY_ANY_VERSION(x, y) (!memcmp(x, y, 7) && !memcmp(x + 8, y + 8, sizeof(y) - 8))
 
-enum MXFCaptionType
-{
-	MXF_CT_VBI,
-	MXF_CT_ANC,
-};
 
-typedef uint8_t UID[16];
 typedef struct KLVPacket
 {
 	UID key;
@@ -35,28 +29,13 @@ typedef struct MXFCodecUL
 
 typedef int ReadFunc(struct ccx_demuxer *ctx, uint64_t size);
 
-typedef struct
-{
-	int track_id;
-	uint8_t track_number[4];
-} MXFTrack;
 
 typedef struct MXFReadTableEntry
 {
 	const UID key;
 	ReadFunc *read;
 } MXFReadTableEntry;
 
-typedef struct MXFContext
-{
-	enum MXFCaptionType type;
-	int cap_track_id;
-	UID cap_essence_key;
-	MXFTrack tracks[32];
-	int nb_tracks;
-	int cap_count;
-	struct ccx_rational edit_rate;
-} MXFContext;
 
 typedef struct MXFLocalTAGS
 {

src/lib_ccx/ccx_demuxer_mxf.c

@@ -3,6 +3,31 @@
 
 #include "ccx_demuxer.h"
 
-int ccx_probe_mxf(struct ccx_demuxer *ctx);
-struct MXFContext *ccx_mxf_init(struct ccx_demuxer *demux);
+typedef uint8_t UID[16];
+
+enum MXFCaptionType
+{
+    MXF_CT_VBI,
+    MXF_CT_ANC,
+};
+
+typedef struct
+{
+    int track_id;
+    uint8_t track_number[4];
+} MXFTrack;
+
+typedef struct MXFContext
+{
+    enum MXFCaptionType type;
+    int cap_track_id;
+    UID cap_essence_key;
+    MXFTrack tracks[32];
+    int nb_tracks;
+    int cap_count;
+    struct ccx_rational edit_rate;
+} MXFContext;
+
+int ccx_probe_mxf(struct ccx_demuxer* ctx);
+struct MXFContext* ccx_mxf_init(struct ccx_demuxer* demux);
 #endif

src/lib_ccx/ccx_demuxer_mxf.h

@@ -19,7 +19,6 @@
 #include "ccx_demuxer.h"
 #include "file_buffer.h"
 
-#define STR_LEN 256u
 
 #define CLOSED_CAP_DID 0x61
 #define CLOSED_C708_SDID 0x01
@@ -303,52 +302,6 @@ struct ccx_gxf_ancillary_data_track
 	uint32_t field_per_frame;
 };
 
-struct ccx_gxf
-{
-	int nb_streams;
-
-	/* Name of Media File  */
-	char media_name[STR_LEN];
-
-	/**
-	 *  The first field number shall represent the position on a playout
-	 *  time line of the first recorded field on a track
-	 */
-	int32_t first_field_nb;
-
-	/**
-	 * The last field number shall represent the position on a playout
-	 *  time line of the last recorded field plus one.
-	 */
-	int32_t last_field_nb;
-
-	/**
-	 * The mark in field number shall represent the position on a playout
-	 *  time line of the first field to be played from a track.
-	 */
-	int32_t mark_in;
-
-	/**
-	 * The mark out field number shall represent the position on a playout
-	 * time line of the last field to be played plus one
-	 */
-	int32_t mark_out;
-
-	/**
-	 * Estimated size in kb for bytes multiply by 1024
-	 */
-	int32_t stream_size;
-
-	struct ccx_gxf_ancillary_data_track *ad_track;
-
-	struct ccx_gxf_video_track *vid_track;
-
-	/**
-	 * cdp data buffer
-	 */
-	unsigned char *cdp;
-	size_t cdp_len;
-};
 
 /**
  * @brief parses a packet header, extracting type and length

src/lib_ccx/ccx_gxf.c

@@ -4,6 +4,55 @@
 #include "ccx_demuxer.h"
 #include "lib_ccx.h"
 
+#define STR_LEN 256u
+
+struct ccx_gxf
+{
+    int nb_streams;
+
+    /* Name of Media File  */
+    char media_name[STR_LEN];
+
+    /**
+     *  The first field number shall represent the position on a playout
+     *  time line of the first recorded field on a track
+     */
+    int32_t first_field_nb;
+
+    /**
+     * The last field number shall represent the position on a playout
+     *  time line of the last recorded field plus one.
+     */
+    int32_t last_field_nb;
+
+    /**
+     * The mark in field number shall represent the position on a playout
+     *  time line of the first field to be played from a track.
+     */
+    int32_t mark_in;
+
+    /**
+     * The mark out field number shall represent the position on a playout
+     * time line of the last field to be played plus one
+     */
+    int32_t mark_out;
+
+    /**
+     * Estimated size in kb for bytes multiply by 1024
+     */
+    int32_t stream_size;
+
+    struct ccx_gxf_ancillary_data_track *ad_track;
+
+    struct ccx_gxf_video_track *vid_track;
+
+    /**
+     * cdp data buffer
+     */
+    unsigned char *cdp;
+    size_t cdp_len;
+};
+
 int ccx_gxf_probe(unsigned char *buf, int len);
 int ccx_gxf_get_more_data(struct lib_ccx_ctx *ctx, struct demuxer_data **data);
 struct ccx_gxf *ccx_gxf_init(struct ccx_demuxer *arg);

src/lib_ccx/ccx_gxf.h

@@ -13,6 +13,16 @@ fn main() {
         "version",
         "set_binary_mode",
         "print_file_report",
+        "start_upd_srv", // shall be removed after NET
+        "start_tcp_srv", // shall be removed after NET
+        "net_tcp_read",  // shall be removed after NET
+        "net_udp_read",  // shall be removed after NET
+        "ccx_probe_mxf", // shall be removed after mxf
+        "ccx_mxf_init",  // shall be removed after mxf
+        "ccx_gxf_probe", // shall be removed after gxf
+        "ccx_gxf_init",  // shall be removed after gxf
+        #[cfg(feature = "enable_ffmpeg")]
+        "init_ffmpeg",
     ]);
 
     #[cfg(feature = "hardsubx_ocr")]
@@ -41,6 +51,8 @@ fn main() {
         "ccx_encoding_type",
         "ccx_decoder_608_settings",
         "ccx_decoder_608_report",
+        "ccx_gxf",
+        "MXFContext",
         "uint8_t",
         "word_list",
     ]);