Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEAT] Add share module in lib_ccxr #1651

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FEAT] Add share module in lib_ccxr #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ if [ "$WITHOUT_RUST" = true ]; then
echo "Building without rust files..."
BLD_FLAGS="$BLD_FLAGS -DDISABLE_RUST"
else
BLD_LINKER="$BLD_LINKER ./libccx_rust.a"
BLD_LINKER="$BLD_LINKER ./libccx_rust.a -lnanomsg"
echo "Checking for cargo..."
if ! [ -x "$(command -v cargo)" ]; then
echo 'Error: cargo is not installed.' >&2
Expand Down
2 changes: 1 addition & 1 deletion mac/build.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c \
../src/thirdparty/freetype/type42/type42.c \
../src/thirdparty/freetype/winfonts/winfnt.c"
BLD_SOURCES="../src/ccextractor.c $SRC_API $SRC_CCX $SRC_LIB_HASH $SRC_LIBPNG $SRC_PROTOBUF $SRC_UTF8 $SRC_ZLIB $SRC_ZVBI $SRC_FREETYPE"
BLD_LINKER="-lm -liconv -lpthread -ldl `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors gpac`"
BLD_LINKER="-lm -liconv -lpthread -ldl -lnanomsg `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors gpac`"
[[ $1 = "OCR" ]] && BLD_LINKER="$BLD_LINKER `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors lept`"

./pre-build.sh
Expand Down
54 changes: 54 additions & 0 deletions src/lib_ccx/ccx_share.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,40 @@
#include <nanomsg/pubsub.h>

ccx_share_service_ctx ccx_share_ctx;
#ifndef DISABLE_RUST
extern void ccxr_sub_entry_msg_cleanup_c(CcxSubEntryMessage *msg);
extern void ccxr_sub_entry_msg_print_c(const CcxSubEntryMessage *msg);
extern void ccxr_sub_entries_cleanup_c(ccx_sub_entries *entries);
extern void ccxr_sub_entries_print_c(const ccx_sub_entries *entries);
extern ccx_share_status ccxr_share_start_c(const char *stream_name);
extern ccx_share_status ccxr_share_stop_c(void);
extern ccx_share_status _ccxr_share_send_c(const CcxSubEntryMessage *msg);
extern ccx_share_status ccxr_share_send_c(const struct cc_subtitle *sub);
extern ccx_share_status ccxr_share_stream_done_c(const char *stream_name);
extern ccx_share_status _ccxr_share_sub_to_entries_c(const struct cc_subtitle *sub, ccx_sub_entries *entries);

#endif

void ccx_sub_entry_msg_cleanup(CcxSubEntryMessage *msg)
{
#ifndef DISABLE_RUST
return ccxr_sub_entry_msg_cleanup_c(msg);
#else

for (int i = 0; i < msg->n_lines; i++)
{
free(msg->lines[i]);
}
free(msg->lines);
free(msg->stream_name);
#endif
}

void ccx_sub_entry_msg_print(CcxSubEntryMessage *msg)
{
#ifndef DISABLE_RUST
return ccxr_sub_entry_msg_print_c(msg);
#else
if (!msg)
{
dbg_print(CCX_DMT_SHARE, "[share] print(!msg)\n");
Expand Down Expand Up @@ -55,6 +76,7 @@ void ccx_sub_entry_msg_print(CcxSubEntryMessage *msg)
}
dbg_print(CCX_DMT_SHARE, "[share] %s\n", msg->lines[i]);
}
#endif
}

void ccx_sub_entries_init(ccx_sub_entries *entries)
Expand All @@ -65,26 +87,37 @@ void ccx_sub_entries_init(ccx_sub_entries *entries)

void ccx_sub_entries_cleanup(ccx_sub_entries *entries)
{
#ifndef DISABLE_RUST
return ccxr_sub_entries_cleanup_c(entries);
#else
for (int i = 0; i < entries->count; i++)
{
ccx_sub_entry_msg_cleanup(entries->messages + i);
}
free(entries->messages);
entries->messages = NULL;
entries->count = 0;
#endif
}

void ccx_sub_entries_print(ccx_sub_entries *entries)
{
#ifndef DISABLE_RUST
return ccxr_sub_entries_print_c(entries);
#else
dbg_print(CCX_DMT_SHARE, "[share] ccx_sub_entries_print (%u entries)\n", entries->count);
for (int i = 0; i < entries->count; i++)
{
ccx_sub_entry_msg_print(entries->messages + i);
}
#endif
}

ccx_share_status ccx_share_start(const char *stream_name) // TODO add stream
{
#ifndef DISABLE_RUST
return ccxr_share_start_c(stream_name);
#else
dbg_print(CCX_DMT_SHARE, "[share] ccx_share_start: starting service\n");
// TODO for multiple files we have to move creation to ccx_share_init
ccx_share_ctx.nn_sock = nn_socket(AF_SP, NN_PUB);
Expand Down Expand Up @@ -121,18 +154,26 @@ ccx_share_status ccx_share_start(const char *stream_name) // TODO add stream

sleep(1); // We have to sleep a while, because it takes some time for subscribers to subscribe
return CCX_SHARE_OK;
#endif
}

ccx_share_status ccx_share_stop()
{
#ifndef DISABLE_RUST
return ccxr_share_stop_c();
#else
dbg_print(CCX_DMT_SHARE, "[share] ccx_share_stop: stopping service\n");
nn_shutdown(ccx_share_ctx.nn_sock, ccx_share_ctx.nn_binder);
free(ccx_share_ctx.stream_name);
return CCX_SHARE_OK;
#endif
}

ccx_share_status ccx_share_send(struct cc_subtitle *sub)
{
#ifndef DISABLE_RUST
return ccxr_share_send_c(sub);
#else
dbg_print(CCX_DMT_SHARE, "[share] ccx_share_send: sending\n");
ccx_sub_entries entries;
ccx_sub_entries_init(&entries);
Expand All @@ -154,10 +195,14 @@ ccx_share_status ccx_share_send(struct cc_subtitle *sub)
ccx_sub_entries_cleanup(&entries);

return CCX_SHARE_OK;
#endif
}

ccx_share_status _ccx_share_send(CcxSubEntryMessage *msg)
{
#ifndef DISABLE_RUST
return _ccxr_share_send_c(msg);
#else
dbg_print(CCX_DMT_SHARE, "[share] _ccx_share_send\n");
size_t len = ccx_sub_entry_message__get_packed_size(msg);
void *buf = malloc(len);
Expand All @@ -175,10 +220,14 @@ ccx_share_status _ccx_share_send(CcxSubEntryMessage *msg)
free(buf);
dbg_print(CCX_DMT_SHARE, "[share] _ccx_share_send: sent\n");
return CCX_SHARE_OK;
#endif
}

ccx_share_status ccx_share_stream_done(char *stream_name)
{
#ifndef DISABLE_RUST
return ccxr_share_stream_done_c(stream_name);
#else
CcxSubEntryMessage msg = CCX_SUB_ENTRY_MESSAGE__INIT;
msg.eos = 1;
msg.stream_name = strdup(stream_name);
Expand All @@ -197,10 +246,14 @@ ccx_share_status ccx_share_stream_done(char *stream_name)
ccx_sub_entry_msg_cleanup(&msg);

return CCX_SHARE_OK;
#endif
}

ccx_share_status _ccx_share_sub_to_entries(struct cc_subtitle *sub, ccx_sub_entries *entries)
{
#ifndef DISABLE_RUST
return _ccxr_share_sub_to_entries_c(sub, entries);
#else
dbg_print(CCX_DMT_SHARE, "\n[share] _ccx_share_sub_to_entry\n");
if (sub->type == CC_608)
{
Expand Down Expand Up @@ -295,6 +348,7 @@ ccx_share_status _ccx_share_sub_to_entries(struct cc_subtitle *sub, ccx_sub_entr
dbg_print(CCX_DMT_SHARE, "[share] done\n");

return CCX_SHARE_OK;
#endif
}

ccx_share_status ccx_share_launch_translator(char *langs, char *auth)
Expand Down
Loading
Loading