[FEAT] Removed the share module

.gitignore

@@ -106,8 +106,6 @@ src/lib_hash/.deps/
 src/lib_hash/.dirstamp
 src/libpng/.deps/
 src/libpng/.dirstamp
-src/protobuf-c/.deps/
-src/protobuf-c/.dirstamp
 src/utf8proc/.deps/
 src/utf8proc/.dirstamp
 src/zlib/.deps/

docs/CHANGES.TXT

@@ -1,5 +1,6 @@
 1.0 (to be released)
 -----------------
+- Removed the Share Module
 - Fix: Regression failures on DVD files
 - Fix: Segmentation faults on MP4 files with CEA-708 captions
 - Refactor: Remove API structures from ccextractor

docs/using_cmake_build.txt

@@ -13,7 +13,7 @@ Step 2) create a separate directory where you want to build the target.
 
 Step 3) make the build system using cmake. Params in [] are optional and have
 been explained later in the document.
-	~> cmake [-DWITH_FFMPEG=ON] [-DWITH_OCR=ON] [-DWITH_SHARING=ON]
+	~> cmake [-DWITH_FFMPEG=ON] [-DWITH_OCR=ON]
     [-DWITH_HARDSUBX=ON] ../src/
 
 Step 4) Compile the code.
@@ -29,9 +29,6 @@ cmake -DWITH_FFMPEG=ON ../src/
 If you want to build CCExtractor with OCR you need to pass
 cmake -DWITH_OCR=ON ../src/
 
-If you want to build CCExtractor with Sharing and Translating service:
-cmake -DWITH_SHARING=ON ../src/
-
 If you want to build CCExtractor with HARDSUBX support
 cmake -DWITH_HARDSUBX=ON ../src/
 

linux/Makefile.am

@@ -123,10 +123,6 @@ ccextractor_SOURCES = \
 				../src/lib_ccx/ccx_gxf.c \
 				../src/lib_ccx/ccx_gxf.h \
 				../src/lib_ccx/ccx_mp4.h \
-				../src/lib_ccx/ccx_share.c \
-				../src/lib_ccx/ccx_share.h \
-				../src/lib_ccx/ccx_sub_entry_message.pb-c.c \
-				../src/lib_ccx/ccx_sub_entry_message.pb-c.h \
 				../src/lib_ccx/compile_info.h \
 				../src/lib_ccx/compile_info_real.h \
 				../src/lib_ccx/configuration.c \
@@ -206,8 +202,6 @@ ccextractor_SOURCES = \
 				../src/thirdparty/utf8proc/utf8proc.h \
 				../src/thirdparty/lib_hash/sha2.c \
 				../src/thirdparty/lib_hash/sha2.h \
-				../src/thirdparty/protobuf-c/protobuf-c.c \
-				../src/thirdparty/protobuf-c/protobuf-c.h \
 				../src/lib_ccx/zvbi/bcd.h \
 				../src/lib_ccx/zvbi/bit_slicer.c \
 				../src/lib_ccx/zvbi/bit_slicer.h \
@@ -272,7 +266,7 @@ endif
 
 ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP
 
-ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I/usr/include/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/lib_ccx/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/
+ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I/usr/include/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/lib_ccx/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/
 
 
 ccextractor_LDADD=-lm -lpthread -ldl -lgpac

linux/build

@@ -35,13 +35,12 @@ if [ "$bit_os" == "64" ]
 then
     BLD_FLAGS="$BLD_FLAGS -DGPAC_64_BITS"
 fi
-BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I /usr/include/gpac/ -I../src/thirdparty/libpng -I../src/thirdparty/zlib -I../src/lib_ccx/zvbi -I../src/thirdparty/lib_hash -I../src/thirdparty/protobuf-c -I../src/thirdparty -I../src/thirdparty/freetype/include"
+BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I /usr/include/gpac/ -I../src/thirdparty/libpng -I../src/thirdparty/zlib -I../src/lib_ccx/zvbi -I../src/thirdparty/lib_hash -I../src/thirdparty -I../src/thirdparty/freetype/include"
 SRC_LIBPNG="$(find ../src/thirdparty/libpng/ -name '*.c')"
 SRC_ZLIB="$(find ../src/thirdparty/zlib/ -name '*.c')"
 SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')"
 SRC_GPAC="$(find /usr/include/gpac/ -name '*.c')"
 SRC_HASH="$(find ../src/thirdparty/lib_hash/ -name '*.c')"
-SRC_PROTOBUF="$(find ../src/thirdparty/protobuf-c/ -name '*.c')"
 SRC_UTF8PROC="../src/thirdparty/utf8proc/utf8proc.c"
 SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c
         ../src/thirdparty/freetype/base/ftbase.c
@@ -84,7 +83,7 @@ SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c
         ../src/thirdparty/freetype/type1/type1.c
         ../src/thirdparty/freetype/type42/type42.c
         ../src/thirdparty/freetype/winfonts/winfnt.c"
-BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC $SRC_FREETYPE"
+BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_LIBPNG $SRC_HASH $SRC_UTF8PROC $SRC_FREETYPE"
 BLD_LINKER="$BLD_LINKER -lm -zmuldefs -l tesseract -l leptonica -lpthread -ldl -lgpac"
 
 echo "Running pre-build script..."

linux/module_generator

@@ -4,8 +4,7 @@ SRC_ZLIB="$(find ../src/thirdparty/zlib/ -name '*.c')"
 SRC_ZVBI="$(find ../src/thirdparty/zvbi/ -name '*.c')"
 SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')"
 SRC_HASH="$(find ../src/thirdparty/lib_hash/ -name '*.c')"
-SRC_PROTOBUF="$(find ../src/thirdparty/protobuf-c/ -name '*.c')"
 SRC_UTF8PROC="../src/utf8proc/utf8proc.c"
-BLD_SOURCES="../src/ccextractor.c ../src/ccextractorapi_wrap.c $SRC_CCX $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC"
+BLD_SOURCES="../src/ccextractor.c ../src/ccextractorapi_wrap.c $SRC_CCX $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_UTF8PROC"
 
 python setup.py $BLD_SOURCES

mac/Makefile.am

@@ -95,10 +95,6 @@ ccextractor_SOURCES = \
 				../src/lib_ccx/ccx_gxf.c \
 				../src/lib_ccx/ccx_gxf.h \
 				../src/lib_ccx/ccx_mp4.h \
-				../src/lib_ccx/ccx_share.c \
-				../src/lib_ccx/ccx_share.h \
-				../src/lib_ccx/ccx_sub_entry_message.pb-c.c \
-				../src/lib_ccx/ccx_sub_entry_message.pb-c.h \
 				../src/lib_ccx/compile_info.h \
 				../src/lib_ccx/compile_info_real.h \
 				../src/lib_ccx/configuration.c \
@@ -178,8 +174,6 @@ ccextractor_SOURCES = \
 				../src/thirdparty/utf8proc/utf8proc.h \
 				../src/thirdparty/lib_hash/sha2.c \
 				../src/thirdparty/lib_hash/sha2.h \
-				../src/thirdparty/protobuf-c/protobuf-c.c \
-				../src/thirdparty/protobuf-c/protobuf-c.h \
 				../src/lib_ccx/zvbi/bcd.h \
 				../src/lib_ccx/zvbi/bit_slicer.c \
 				../src/lib_ccx/zvbi/bit_slicer.h \
@@ -247,7 +241,7 @@ ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFF
 ccextractor_LDFLAGS = $(shell pkg-config --libs gpac)
 GPAC_CPPFLAGS = $(shell pkg-config --cflags gpac)
 
-ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/lib_ccx/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/
+ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/lib_ccx/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/
 ccextractor_CPPFLAGS += $(GPAC_CPPFLAGS)
 ccextractor_CPPFLAGS += $(FFMPEG_CPPFLAGS)
 

mac/build.command

@@ -2,12 +2,11 @@
 cd `dirname $0`
 BLD_FLAGS="-std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DDISABLE_RUST"
 [[ $1 = "OCR" ]] && BLD_FLAGS="$BLD_FLAGS -DENABLE_OCR"
-BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/lib_hash -I../src/thirdparty/libpng -I../src/thirdparty -I../src/thirdparty/protobuf-c -I../src/thirdparty/zlib -I../src/thirdparty/freetype/include `pkg-config --cflags --silence-errors gpac`"
+BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/lib_hash -I../src/thirdparty/libpng -I../src/thirdparty -I../src/thirdparty/zlib -I../src/thirdparty/freetype/include `pkg-config --cflags --silence-errors gpac`"
 [[ $1 = "OCR" ]] && BLD_INCLUDE="$BLD_INCLUDE `pkg-config --cflags --silence-errors tesseract`"
 SRC_CCX="$(find ../src/lib_ccx -name '*.c')"
 SRC_LIB_HASH="$(find ../src/thirdparty/lib_hash -name '*.c')"
 SRC_LIBPNG="$(find ../src/thirdparty/libpng -name '*.c')"
-SRC_PROTOBUF="$(find ../src/thirdparty/protobuf-c -name '*.c')"
 SRC_UTF8="../src/thirdparty/utf8proc/utf8proc.c"
 SRC_ZLIB="$(find ../src/thirdparty/zlib -name '*.c')"
 SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c \
@@ -51,7 +50,7 @@ SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c \
 		../src/thirdparty/freetype/type1/type1.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_SOURCES="../src/ccextractor.c $SRC_API $SRC_CCX $SRC_LIB_HASH $SRC_LIBPNG $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`"
 [[ $1 = "OCR" ]] && BLD_LINKER="$BLD_LINKER `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors lept`"
 

src/BUILD

@@ -4,11 +4,10 @@ cc_binary(
             "ccextractor.h"],
     deps = [
             "//src/lib_ccx:lib_ccx",
-            "//src/thirdparty/protobuf-c:protobuf-c",
             "//src/thirdparty/zlib:zlib",
             "//src/thirdparty/freetype:freetype"
     ],
-    copts = [ "-Isrc/thirdparty/protobuf-c", "-Isrc/thirdparty/libpng", "-Isrc" ]
+    copts = [ "-Isrc/thirdparty/libpng", "-Isrc" ]
 )
 
 exports_files (["ccextractor.h"], ["//src/lib_ccx:__pkg__"])

src/CMakeLists.txt

@@ -5,7 +5,6 @@ include (CTest)
 
 option (WITH_FFMPEG "Build using FFmpeg demuxer and decoder" OFF)
 option (WITH_OCR "Build with OCR (Optical Character Recognition) feature" OFF)
-option (WITH_SHARING "Build with sharing and translation support" OFF)
 option (WITH_HARDSUBX "Build with support for burned-in subtitles" OFF)
 option (WITHOUT_RUST "Build without Rust library" OFF)
 
@@ -52,7 +51,6 @@ include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/lib_ccx)
 include_directories(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng)
 
@@ -72,7 +70,6 @@ include_directories(${PROJECT_SOURCE_DIR}/thirdparty/zlib)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/freetype/include)
 aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash/ SOURCEFILE)
 aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/ SOURCEFILE)
-aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/ SOURCEFILE)
 aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/zlib/ SOURCEFILE)
 aux_source_directory(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi/ SOURCEFILE)
 
@@ -206,21 +203,6 @@ if (PKG_CONFIG_FOUND AND WITH_OCR)
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_OCR")
 endif (PKG_CONFIG_FOUND AND WITH_OCR)
 
-########################################################
-# Build with CC sharing and translation support
-########################################################
-
-if (PKG_CONFIG_FOUND AND WITH_SHARING)
-
-  pkg_check_modules (NANOMSG REQUIRED libnanomsg)
-  set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_STATIC_LIBRARIES})
-
-  include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/")
-  aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/" SOURCEFILE)
-
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SHARING")
-endif (PKG_CONFIG_FOUND AND WITH_SHARING)
-
 ########################################################
 # Build for hardsubx using avformat, avutil, avcodec and
 # swscale

src/ccextractor.c

@@ -138,27 +138,10 @@ int start_ccx()
 #endif
 	terminate_asap = 0;
 
-#ifdef ENABLE_SHARING
-	if (ccx_options.translate_enabled && ctx->num_input_files > 1)
-	{
-		mprint("[share] WARNING: simultaneous translation of several input files is not supported yet\n");
-		ccx_options.translate_enabled = 0;
-		ccx_options.sharing_enabled = 0;
-	}
-	if (ccx_options.translate_enabled)
-	{
-		mprint("[share] launching translate service\n");
-		ccx_share_launch_translator(ccx_options.translate_langs, ccx_options.translate_key);
-	}
-#endif // ENABLE_SHARING
 	ret = 0;
 	while (switch_to_next_file(ctx, 0))
 	{
 		prepare_for_new_file(ctx);
-#ifdef ENABLE_SHARING
-		if (ccx_options.sharing_enabled)
-			ccx_share_start(ctx->basefilename);
-#endif // ENABLE_SHARING
 
 		stream_mode = ctx->demux_ctx->get_stream_mode(ctx->demux_ctx);
 		// Disable sync check for raw formats - they have the right timeline.
@@ -310,14 +293,6 @@ int start_ccx()
 			dec_ctx->timing->fts_now = 0;
 			dec_ctx->timing->fts_max = 0;
 
-#ifdef ENABLE_SHARING
-			if (ccx_options.sharing_enabled)
-			{
-				ccx_share_stream_done(ctx->basefilename);
-				ccx_share_stop();
-			}
-#endif // ENABLE_SHARING
-
 			if (dec_ctx->total_pulldownframes)
 				mprint("incl. pulldown frames:  %s  (%u frames at %.2ffps)\n",
 				       print_mstime_static((LLONG)(dec_ctx->total_pulldownframes * 1000 / current_fps)),

src/ccextractor.h

@@ -19,7 +19,6 @@
 #include "lib_ccx/ccx_common_option.h"
 #include "lib_ccx/ccx_mp4.h"
 #include "lib_ccx/hardsubx.h"
-#include "lib_ccx/ccx_share.h"
 #ifdef WITH_LIBCURL
 CURL *curl;
 CURLcode res;

src/lib_ccx/BUILD

@@ -6,16 +6,14 @@ cc_library(
     hdrs = glob (["*.h", "zvbi/*.h", "*.xbm"]) + [ "//src:ccextractor.h" ],
     visibility = ["//visibility:public"],
     deps = [
-            "//src/thirdparty/protobuf-c:protobuf-c",
             "//src/thirdparty/libpng:libpng",
             "//src/thirdparty/freetype:freetype",
             "//src/thirdparty/lib_hash:lib_hash",
             "//src/thirdparty/utf8proc:utf8proc",
     ],
-    includes = [ "thirdparty/protobuf-c", "thirdparty/libpng", "." ,
+    includes = [ "thirdparty/libpng", "." ,
                  "thirdparty/freetype/include" ],
-    copts = [ "-Isrc/thirdparty/protobuf-c", 
-              "-Isrc/thirdparty/libpng", 
+    copts = [ "-Isrc/thirdparty/libpng",
               "-Isrc/", 
               "-Isrc/thirdparty/freetype",
               "-Isrc/thirdparty/lib_hash",

src/lib_ccx/CMakeLists.txt

@@ -56,9 +56,6 @@ if (WITH_OCR)
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_OCR")
 endif (WITH_OCR)
 
-if (WITH_SHARING)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SHARING")
-endif (WITH_SHARING)
 
 aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_ccx/" SOURCEFILE)
 

src/lib_ccx/ccx_common_constants.h

@@ -58,9 +58,6 @@ enum ccx_debug_message_types
 	CCX_DMT_LEVENSHTEIN = 0x1000,    // Levenshtein distance calculations
 	CCX_DMT_DVB = 0x2000,			 // DVB 
 	CCX_DMT_DUMPDEF = 0x4000         // Dump defective TS packets
-#ifdef ENABLE_SHARING
-	CCX_DMT_SHARE = 0x8000,          // Extracted captions sharing service
-#endif //ENABLE_SHARING
 };
 
 // AVC NAL types

src/lib_ccx/ccx_common_option.c

@@ -151,13 +151,6 @@ void init_options(struct ccx_s_options *options)
 	    options->settings_dtvcc.services_enabled, 0,
 	    CCX_DTVCC_MAX_SERVICES * sizeof(options->settings_dtvcc.services_enabled[0]));
 
-#ifdef ENABLE_SHARING
-	options->sharing_enabled = 0;
-	options->sharing_url = NULL;
-	options->translate_enabled = 0;
-	options->translate_key = NULL;
-	options->translate_langs = NULL;
-#endif // ENABLE_SHARING
 #ifdef WITH_LIBCURL
 	options->curlposturl = NULL;
 #endif

src/lib_ccx/ccx_common_option.h

@@ -198,17 +198,6 @@ struct ccx_s_options // Options from user parameters
 #ifdef WITH_LIBCURL
 	char *curlposturl;
 #endif
-
-
-#ifdef ENABLE_SHARING
-	//CC sharing
-	int sharing_enabled;
-	char *sharing_url;
-	//Translating
-	int translate_enabled;
-	char *translate_langs;
-	char *translate_key;
-#endif
 };
 
 extern struct ccx_s_options ccx_options;

src/lib_ccx/ccx_encoders_common.c

@@ -8,9 +8,6 @@
 #include "ccx_encoders_xds.h"
 #include "ccx_encoders_helpers.h"
 #include "ccextractor.h"
-#ifdef ENABLE_SHARING
-#include "ccx_share.h"
-#endif // ENABLE_SHARING
 
 #ifdef WIN32
 int fsync(int fd)
@@ -1094,11 +1091,6 @@ int encode_sub(struct encoder_ctx *context, struct cc_subtitle *sub)
 
 	context = change_filename(context);
 
-#ifdef ENABLE_SHARING
-	if (ccx_options.sharing_enabled)
-		ccx_share_send(sub);
-#endif // ENABLE_SHARING
-
 	if (context->sbs_enabled)
 	{
 		// Write to a buffer that is later s+plit to generate split

src/lib_ccx/ccx_encoders_splitbysentence.c

@@ -27,10 +27,6 @@
 #define LOG_DEBUG(...)
 #endif
 
-#ifdef ENABLE_SHARING
-#include "ccx_share.h"
-#endif // ENABLE_SHARING
-
 //---------------------------
 // BEGIN of #BUG639
 // HACK: this is workaround for https://github.com/CCExtractor/ccextractor/issues/639

src/lib_ccx/ccx_encoders_transcript.c

@@ -9,10 +9,6 @@
 #include "ccx_encoders_helpers.h"
 #include "lib_ccx.h"
 
-#ifdef ENABLE_SHARING
-#include "ccx_share.h"
-#endif // ENABLE_SHARING
-
 int write_cc_bitmap_as_transcript(struct cc_subtitle *sub, struct encoder_ctx *context)
 {
 	int ret = 0;