d

Author: steel-bucket

.github/workflows/build_linux.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install dependencies
-      run: sudo apt update && sudo apt-get install libgpac-dev libtesseract-dev
+      run: sudo apt update && sudo apt-get install libgpac-dev libtesseract-dev libnanomsg-dev
     - uses: actions/checkout@v4
     - name: build
       run: ./build
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install dependencies
-      run: sudo apt update && sudo apt-get install libgpac-dev
+      run: sudo apt update && sudo apt-get install libgpac-dev libnanomsg-dev
     - uses: actions/checkout@v4
     - name: run autogen
       run: ./autogen.sh
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install dependencies
-      run: sudo apt update && sudo apt-get install libgpac-dev
+      run: sudo apt update && sudo apt-get install libgpac-dev libnanomsg-dev
     - uses: actions/checkout@v4
     - name: cmake
       run: mkdir build && cd build && cmake ../src
@@ -78,7 +78,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install dependencies
-      run: sudo apt update && sudo apt install libgpac-dev libtesseract-dev libavformat-dev libavdevice-dev libswscale-dev yasm
+      run: sudo apt update && sudo apt install libgpac-dev libtesseract-dev libavformat-dev libavdevice-dev libswscale-dev yasm libnanomsg-dev
     - name: cmake
       run: |
         mkdir build && cd build

linux/Makefile.am

@@ -334,7 +334,7 @@ ccextractor_LDADD += $(LEPT_LIB)
 endif
 
 if WITH_RUST
-ccextractor_LDADD += ./rust/@RUST_TARGET_SUBDIR@/libccx_rust.a
+ccextractor_LDADD += ./rust/@RUST_TARGET_SUBDIR@/libccx_rust.a -lnanomsg
 else
 ccextractor_CFLAGS += -DDISABLE_RUST
 ccextractor_CPPFLAGS += -DDISABLE_RUST

linux/build

@@ -94,7 +94,7 @@ echo "Trying to compile..."
 if [ "$WITHOUT_RUST" = true ]; then
     echo "Building without rust files..."
     BLD_FLAGS="$BLD_FLAGS -DDISABLE_RUST"
-else 
+else
     BLD_LINKER="$BLD_LINKER ./libccx_rust.a -lnanomsg"
     echo "Checking for cargo..."
     if ! [ -x "$(command -v cargo)" ]; then

mac/Makefile.am

@@ -307,7 +307,7 @@ ccextractor_LDADD += $(LEPT_LIB)
 endif
 
 if WITH_RUST
-ccextractor_LDADD += ./rust/@RUST_TARGET_SUBDIR@/libccx_rust.a
+ccextractor_LDADD += ./rust/@RUST_TARGET_SUBDIR@/libccx_rust.a -lnanomsg
 else
 ccextractor_CFLAGS += -DDISABLE_RUST
 ccextractor_CPPFLAGS += -DDISABLE_RUST

src/CMakeLists.txt

@@ -152,6 +152,7 @@ add_subdirectory (lib_ccx)
 aux_source_directory(${PROJECT_SOURCE_DIR} SOURCEFILE)
 set (EXTRA_LIBS ${EXTRA_LIBS} ccx)
 set (EXTRA_LIBS ${EXTRA_LIBS} ${GPAC_LIBRARIES})
+set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_LIBRARIES})
 # set (EXTRA_LIBS ${EXTRA_LIBS} m)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -262,6 +263,10 @@ else ()
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_RUST")
 endif (PKG_CONFIG_FOUND AND NOT WITHOUT_RUST)
 
+pkg_check_modules(NANOMSG REQUIRED nanomsg)
+
+set(EXTRA_INCLUDES ${EXTRA_INCLUDES}  ${NANOMSG_INCLUDE_DIR})
+set(EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_LIBRARIES})
 
 target_link_libraries (ccextractor ${EXTRA_LIBS})
 target_include_directories (ccextractor PUBLIC ${EXTRA_INCLUDES})

src/lib_ccx/CMakeLists.txt

@@ -15,6 +15,12 @@ pkg_check_modules (GPAC REQUIRED gpac)
 
 set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${GPAC_INCLUDE_DIRS})
 set (EXTRA_LIBS ${EXTRA_LIBS} ${GPAC_LIBRARIES})
+##new
+pkg_check_modules(NANOMSG REQUIRED nanomsg)
+
+set(EXTRA_INCLUDES ${EXTRA_INCLUDES} ${NANOMSG_INCLUDE_DIRS})
+set(EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_LIBRARIES})
+##new
 
 if (WITH_FFMPEG)
     find_package(PkgConfig)

src/rust/lib_ccxr/src/share/share.rs

@@ -1,17 +1,16 @@
-use std::{ptr, thread, time::Duration, ffi::{CString, CStr}};
-use std::any::Any;
+extern crate libc;
 use std::cmp::PartialEq;
 use std::io::Write;
+use std::{ffi::{CStr, CString}, time::Duration};
 
-extern crate libc;
-use std::os::raw::{c_char, c_int, c_void};
-use std::sync::{Mutex, Once};
-use std::thread::sleep;
-use crate::util::log::{debug, info, DebugMessageFlag};
 use crate::share::ccxr_sub_entry_message::CcxSubEntryMessage;
-use nanomsg::{Endpoint, Protocol, Socket};
+use crate::util::log::{debug, DebugMessageFlag};
 use lazy_static::lazy_static;
+use nanomsg::{Endpoint, Protocol, Socket};
 use prost::Message;
+use std::os::raw::{c_char, c_int};
+use std::sync::Mutex;
+use std::thread::sleep;
 
 // use crate::bindings::{cc_subtitle, ccx_output_format};
 
@@ -119,7 +118,7 @@ impl Eia608Screen {
     pub fn free_xds_str(&mut self) {
         if !self.xds_str.is_null() {
             unsafe {
-                CString::from_raw(self.xds_str);
+                let _ = CString::from_raw(self.xds_str);
             }
             self.xds_str = std::ptr::null_mut();
             self.xds_len = 0;
@@ -134,41 +133,41 @@ impl Drop for Eia608Screen {
 }
 
 
-pub type subdatatype = ::std::os::raw::c_uint;
+pub type SubDataType = std::os::raw::c_uint;
 pub type LLONG = i64;
-pub const subtype_CC_BITMAP: subtype = 0;
-pub const subtype_CC_608: subtype = 1;
-pub const subtype_CC_TEXT: subtype = 2;
-pub const subtype_CC_RAW: subtype = 3;
-pub type subtype = ::std::os::raw::c_uint;
+pub const SUBTYPE_CC_BITMAP: Subtype = 0;
+pub const SUBTYPE_CC_608: Subtype = 1;
+pub const SUBTYPE_CC_TEXT: Subtype = 2;
+pub const SUBTYPE_CC_RAW: Subtype = 3;
+pub type Subtype = std::os::raw::c_uint;
 
-pub type ccx_encoding_type = ::std::os::raw::c_uint;
+pub type CcxEncodingType = std::os::raw::c_uint;
 
 pub struct CcSubtitle {
     #[doc = " A generic data which contain data according to decoder\n @warn decoder cant output multiple types of data"]
-    pub data: *mut ::std::os::raw::c_void,
-    pub datatype: subdatatype,
+    pub data: *mut std::os::raw::c_void,
+    pub datatype: SubDataType,
     #[doc = " number of data"]
-    pub nb_data: ::std::os::raw::c_uint,
+    pub nb_data: std::os::raw::c_uint,
     #[doc = "  type of subtitle"]
-    pub type_: subtype,
+    pub type_: Subtype,
     #[doc = " Encoding type of Text, must be ignored in case of subtype as bitmap or cc_screen"]
-    pub enc_type: ccx_encoding_type,
+    pub enc_type: CcxEncodingType,
     pub start_time: LLONG,
     pub end_time: LLONG,
-    pub flags: ::std::os::raw::c_int,
-    pub lang_index: ::std::os::raw::c_int,
+    pub flags: c_int,
+    pub lang_index: c_int,
     #[doc = " flag to tell that decoder has given output"]
-    pub got_output: ::std::os::raw::c_int,
-    pub mode: [::std::os::raw::c_char; 5usize],
-    pub info: [::std::os::raw::c_char; 4usize],
+    pub got_output: c_int,
+    pub mode: [c_char; 5usize],
+    pub info: [c_char; 4usize],
     #[doc = " Used for DVB end time in ms"]
-    pub time_out: ::std::os::raw::c_int,
+    pub time_out: c_int,
     pub next: *mut CcSubtitle,
     pub prev: *mut CcSubtitle,
 }
 
-
+#[repr(C)]
 #[derive(Debug)]
 pub enum CcxShareStatus {
     Ok = 0,
@@ -256,7 +255,6 @@ pub fn ccxr_sub_entry_msg_print(msg: &CcxSubEntryMessage) {
 }
 
 
-
 pub fn ccxr_sub_entries_cleanup(entries: &mut CcxSubEntries) {
     entries.messages.clear();
 }
@@ -272,16 +270,16 @@ pub fn ccxr_share_start(stream_name: &str) -> CcxShareStatus {
     debug!(msg_type = DebugMessageFlag::SHARE; "[share] ccx_share_start: starting service\n");
     let mut ctx = CCX_SHARE_CTX.lock().unwrap();
     ctx.nn_sock = Some(Socket::new(Protocol::Pub).unwrap());
-    if (ctx.nn_sock.is_none()) {
+    if ctx.nn_sock.is_none() {
         debug!(msg_type = DebugMessageFlag::SHARE; "[share] ccx_share_start: can't nn_socket()\n");
         return CcxShareStatus::Fail;
     }
-    /// TODO translating this line
-    /// if (!ccx_options.sharing_url)
-    /// {
-    ///     ccx_options.sharing_url = "tcp://*:3269";
-    /// }
-    /// dbg_print(CCX_DMT_SHARE, "[share] ccx_share_start: url=%s\n", ccx_options.sharing_url);
+    // TODO translating this line
+    // if (!ccx_options.sharing_url)
+    // {
+    //     ccx_options.sharing_url = "tcp://*:3269";
+    // }
+    // dbg_print(CCX_DMT_SHARE, "[share] ccx_share_start: url=%s\n", ccx_options.sharing_url);
     let sharing_url = "tcp://*:3269"; // Default URL if none is provided
     debug!(msg_type = DebugMessageFlag::SHARE; "[share] ccx_share_start: url={}", sharing_url);
     let binder = match ctx.nn_sock.as_mut().unwrap().bind(sharing_url) {
@@ -371,7 +369,8 @@ pub fn _ccxr_share_send(msg: &CcxSubEntryMessage) -> CcxShareStatus {
     let len = ccxr_sub_entry_message_get_packed_size(msg);
     let mut buf = Vec::with_capacity(len);
     debug!(msg_type = DebugMessageFlag::SHARE; "[share] _ccx_share_send: packing");
-    ccxr_sub_entry_message_pack(msg, &mut buf);
+    #[allow(unused)]
+    let _ = ccxr_sub_entry_message_pack(msg, &mut buf);
     debug!(msg_type = DebugMessageFlag::SHARE; "[share] _ccx_share_send: sending");
     let mut ctx = CCX_SHARE_CTX.lock().unwrap();
     if let Some(sock) = ctx.nn_sock.as_mut() {
@@ -409,8 +408,7 @@ pub fn ccxr_share_stream_done(stream_name: &str) -> CcxShareStatus {
         end_time: 0,
         lines: Vec::new(),
     };
-
-
+    #[allow(unused)]
     let mut ctx = CCX_SHARE_CTX.lock().unwrap();
 
     if _ccxr_share_send(&msg) != CcxShareStatus::Ok {
@@ -428,7 +426,7 @@ pub fn ccxr_share_sub_to_entries(sub: &CcSubtitle, entries: &mut CcxSubEntries)
 
         debug!(msg_type = DebugMessageFlag::SHARE; "[share] _ccx_share_sub_to_entries");
 
-        if sub.type_ == subtype_CC_608 {
+        if sub.type_ == SUBTYPE_CC_608 {
             debug!(msg_type = DebugMessageFlag::SHARE; "[share] CC_608");
 
             let data_ptr = sub.data as *const Eia608Screen;
@@ -489,13 +487,13 @@ pub fn ccxr_share_sub_to_entries(sub: &CcSubtitle, entries: &mut CcxSubEntries)
             }
         } else {
             match sub.type_ {
-                subtype_CC_BITMAP => {
+                SUBTYPE_CC_BITMAP => {
                     debug!(msg_type = DebugMessageFlag::SHARE; "[share] CC_BITMAP. Skipping");
                 }
-                subtype_CC_RAW => {
+                SUBTYPE_CC_RAW => {
                     debug!(msg_type = DebugMessageFlag::SHARE; "[share] CC_RAW. Skipping");
                 }
-                subtype_CC_TEXT => {
+                SUBTYPE_CC_TEXT => {
                     debug!(msg_type = DebugMessageFlag::SHARE; "[share] CC_TEXT. Skipping");
                 }
                 _ => {

src/rust/lib_ccxr/src/share/tests.rs

@@ -1,11 +1,12 @@
-mod test {
-    use libc::c_char;
-    use crate::share::share::*;
-    use crate::share::ccxr_sub_entry_message::*;
-    use std::sync::Once;
-    use crate::util::log::{set_logger, CCExtractorLogger, DebugMessageFlag, DebugMessageMask, OutputTarget};
-
+#![allow(unused_imports)]
+#![allow(unused)]
+use libc::c_char;
+use crate::share::share::*;
+use crate::share::ccxr_sub_entry_message::*;
+use std::sync::Once;
+use crate::util::log::{set_logger, CCExtractorLogger, DebugMessageFlag, DebugMessageMask, OutputTarget};
 
+mod test {
     use super::*;
 
     static INIT: Once = Once::new();
@@ -114,7 +115,6 @@ mod test {
         unsafe {
             ccxr_sub_entries_print(&*(&entries as *const CcxSubEntries));
         }
-
     }
     #[test]
     fn test_ccxr_share_stop() {
@@ -148,11 +148,6 @@ mod test {
         assert!(matches!(status, CcxShareStatus::Ok | CcxShareStatus::Fail));
     }
 
-    #[test]
-    fn test_ccxr_share_stream_done() {
-        let status = ccxr_share_stream_done("test_stream");
-        assert_eq!(status, CcxShareStatus::Ok);
-    }
     #[test]
     fn test_ccxr_share_send_c() {
         initialize_logger();
@@ -202,10 +197,10 @@ mod test {
         screen.my_field = 42;
 
         let sub = CcSubtitle {
-            data: &screen as *const _ as *mut ::std::os::raw::c_void,
+            data: &screen as *const _ as *mut std::os::raw::c_void,
             datatype: 1,
             nb_data: 1,
-            type_: subtype_CC_608,
+            type_: SUBTYPE_CC_608,
             enc_type: 1,
             start_time: 0,
             end_time: 0,
@@ -241,10 +236,10 @@ mod test {
         screen.end_time = 2000;
 
         let sub = CcSubtitle {
-            data: &screen as *const _ as *mut ::std::os::raw::c_void,
+            data: &screen as *const _ as *mut std::os::raw::c_void,
             datatype: 1,
             nb_data: 1,
-            type_: subtype_CC_608,
+            type_: SUBTYPE_CC_608,
             enc_type: 1,
             start_time: 0,
             end_time: 0,

src/rust/src/libccxr_exports/share.rs

@@ -1,7 +1,7 @@
-use std::ffi::CStr;
-use lib_ccxr::share::share::*;
 use lib_ccxr::share::ccxr_sub_entry_message::*;
-use lib_ccxr::util::log::{debug, info, DebugMessageFlag};
+use lib_ccxr::share::share::*;
+use lib_ccxr::util::log::{debug, DebugMessageFlag};
+use std::ffi::CStr;
 /// C-compatible function to clean up a `CcxSubEntryMessage`.
 #[no_mangle]
 pub extern "C" fn ccxr_sub_entry_msg_cleanup_c(msg: *mut CcxSubEntryMessage) {