Merge branch 'master' into migration-demuxer-module

Author: steel-bucket

src/lib_ccx/ccx_decoders_608.c

@@ -1288,7 +1288,7 @@ unsigned char *debug_608_to_ASC(unsigned char *cc_data, int channel)
 		if (hi >= 0x20)
 		{
 			output[0] = hi;
-			output[1] = (lo >= 20 ? lo : '.');
+			output[1] = (lo >= 0x20 ? lo : '.');
 			output[2] = '\x00';
 		}
 		else

src/lib_ccx/ccx_decoders_vbi.h

@@ -25,5 +25,4 @@ struct ccx_decoder_vbi_ctx
 };
 
 
-int decode_vbi(struct lib_cc_decode *dec_ctx, uint8_t field, unsigned char *buffer, size_t len,  struct cc_subtitle *sub);
 #endif

src/lib_ccx/es_functions.c

@@ -22,8 +22,14 @@ static int read_pic_data(struct bitstream *esstream);
 /* Process a mpeg-2 data stream with "length" bytes in buffer "data".
  * The number of processed bytes is returned.
  * Defined in ISO/IEC 13818-2 6.2 */
+#ifndef DISABLE_RUST
+size_t ccxr_process_m2v(struct encoder_ctx *enc_ctx, struct lib_cc_decode *dec_ctx, unsigned char *data, size_t length, struct cc_subtitle *sub);
+#endif
 size_t process_m2v(struct encoder_ctx *enc_ctx, struct lib_cc_decode *dec_ctx, unsigned char *data, size_t length, struct cc_subtitle *sub)
 {
+#ifndef DISABLE_RUST
+	return ccxr_process_m2v(enc_ctx, dec_ctx, data, length, sub);
+#endif
 	if (length < 8) // Need to look ahead 8 bytes
 		return length;
 

src/lib_ccx/lib_ccx.h

@@ -325,4 +325,6 @@ int process_non_multiprogram_general_loop(struct lib_ccx_ctx* ctx,
 											int ret,
 											int *caps);
 void segment_output_file(struct lib_ccx_ctx *ctx, struct lib_cc_decode *dec_ctx);
+int decode_vbi(struct lib_cc_decode *dec_ctx, uint8_t field, unsigned char *buffer, size_t len,  struct cc_subtitle *sub);
+
 #endif

src/lib_ccx/networking.c

@@ -45,6 +45,24 @@ const char *srv_pwd;
 unsigned char *srv_header;
 size_t srv_header_len;
 
+#ifndef DISABLE_RUST
+extern void ccxr_connect_to_srv(const char *addr, const char *port, const char *cc_desc, const char *pwd);
+extern void ccxr_net_send_header(const unsigned char *data, size_t len);
+extern int ccxr_net_send_cc(const unsigned char *data, int length, void *private_data, struct cc_subtitle *sub);
+extern void ccxr_net_check_conn();
+extern void ccxr_net_send_epg(
+    const char *start,
+    const char *stop,
+    const char *title,
+    const char *desc,
+    const char *lang,
+    const char *category);
+extern int ccxr_net_tcp_read(int socket, void *buffer, size_t length);
+extern int ccxr_net_udp_read(int socket, void *buffer, size_t length, const char *src_str, const char *addr_str);
+extern int ccxr_start_tcp_srv(const char *port, const char *pwd);
+extern int ccxr_start_udp_srv(const char *src, const char *addr, unsigned port);
+#endif
+
 /*
  * Established connection to specified address.
  * Returns socked id
@@ -84,6 +102,9 @@ int set_nonblocking(int fd);
 
 void connect_to_srv(const char *addr, const char *port, const char *cc_desc, const char *pwd)
 {
+#ifndef DISABLE_RUST
+	return ccxr_connect_to_srv(addr, port, cc_desc, pwd);
+#endif
 	if (NULL == addr)
 	{
 		mprint("Server address is not set\n");
@@ -115,6 +136,9 @@ void connect_to_srv(const char *addr, const char *port, const char *cc_desc, con
 
 void net_send_header(const unsigned char *data, size_t len)
 {
+#ifndef DISABLE_RUST
+	return ccxr_net_send_header(data, len);
+#endif
 	assert(srv_sd > 0);
 
 #if DEBUG_OUT
@@ -141,6 +165,9 @@ void net_send_header(const unsigned char *data, size_t len)
 
 int net_send_cc(const unsigned char *data, int len, void *private_data, struct cc_subtitle *sub)
 {
+#ifndef DISABLE_RUST
+	return ccxr_net_send_cc(data, len, private_data, sub);
+#endif
 	assert(srv_sd > 0);
 
 #if DEBUG_OUT
@@ -160,6 +187,9 @@ int net_send_cc(const unsigned char *data, int len, void *private_data, struct c
 
 void net_check_conn()
 {
+#ifndef DISABLE_RUST
+	return ccxr_net_check_conn();
+#endif
 	time_t now;
 	static time_t last_ping = 0;
 	char c = 0;
@@ -221,6 +251,9 @@ void net_send_epg(
     const char *lang,
     const char *category)
 {
+#ifndef DISABLE_RUST
+	return ccxr_net_send_epg(start, stop, title, desc, lang, category);
+#endif
 	size_t st;
 	size_t sp;
 	size_t t;
@@ -301,6 +334,9 @@ void net_send_epg(
 
 int net_tcp_read(int socket, void *buffer, size_t length)
 {
+#ifndef DISABLE_RUST
+	return ccxr_net_tcp_read(socket, buffer, length);
+#endif
 	assert(buffer != NULL);
 	assert(length > 0);
 
@@ -333,6 +369,9 @@ int net_tcp_read(int socket, void *buffer, size_t length)
 
 int net_udp_read(int socket, void *buffer, size_t length, const char *src_str, const char *addr_str)
 {
+#ifndef DISABLE_RUST
+	return ccxr_net_udp_read(socket, buffer, length, src_str, addr_str);
+#endif
 	assert(buffer != NULL);
 	assert(length > 0);
 
@@ -519,6 +558,9 @@ int tcp_connect(const char *host, const char *port)
 
 int start_tcp_srv(const char *port, const char *pwd)
 {
+#ifndef DISABLE_RUST
+	return ccxr_start_tcp_srv(port, pwd);
+#endif
 	if (NULL == port)
 		port = DFT_PORT;
 
@@ -974,6 +1016,10 @@ ssize_t read_byte(int fd, char *ch)
 
 int start_upd_srv(const char *src_str, const char *addr_str, unsigned port)
 {
+#ifndef DISABLE_RUST
+	return ccxr_start_udp_srv(src_str, addr_str, port);
+#endif
+
 	init_sockets();
 
 	in_addr_t src;