demuxer: added demuxer data transfer functions and removed some structs

Author: steel-bucket

src/lib_ccx/ccx_demuxer.c

@@ -16,9 +16,9 @@ void ccxr_demuxer_delete(struct ccx_demuxer **ctx);
 
 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,37 +30,39 @@ 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);
-#else
+// #ifndef DISABLE_RUST
+// 	ccxr_demuxer_close(ctx);
+// 	mprint("ctx.past = %lld\n", ctx->past);
+// 	mprint("ctx.infd = %lld\n", ctx->infd);
+// #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;
@@ -218,13 +220,13 @@ 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);
@@ -237,23 +239,23 @@ 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
+// #ifndef DISABLE_RUST
+// 	return ccxr_demuxer_get_stream_mode(ctx);
+// #else
 	return ctx->stream_mode;
-#endif
+// #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:
@@ -298,14 +300,14 @@ 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
+// #ifndef DISABLE_RUST
+// 	ccxr_demuxer_delete(ctx);
+// #else
 	struct ccx_demuxer *lctx = *ctx;
 	int i;
 	dinit_cap(lctx);
@@ -328,7 +330,7 @@ void ccx_demuxer_delete(struct ccx_demuxer **ctx)
 
 	freep(&lctx->filebuffer);
 	freep(ctx);
-#endif
+// #endif
 }
 
 struct ccx_demuxer *init_demuxer(void *parent, struct demuxer_cfg *cfg)