Share Module: Removed Sharing Service

Author: steel-bucket

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

@@ -124,7 +124,6 @@ ccextractor_SOURCES = \
 				../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 \

mac/Makefile.am

@@ -96,7 +96,6 @@ ccextractor_SOURCES = \
 				../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/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)
 
@@ -206,21 +205,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 api_start(struct ccx_s_options api_options)
 #endif
 	terminate_asap = 0;
 
-#ifdef ENABLE_SHARING
-	if (api_options.translate_enabled && ctx->num_input_files > 1)
-	{
-		mprint("[share] WARNING: simultaneous translation of several input files is not supported yet\n");
-		api_options.translate_enabled = 0;
-		api_options.sharing_enabled = 0;
-	}
-	if (api_options.translate_enabled)
-	{
-		mprint("[share] launching translate service\n");
-		ccx_share_launch_translator(api_options.translate_langs, api_options.translate_key);
-	}
-#endif // ENABLE_SHARING
 	ret = 0;
 	while (switch_to_next_file(ctx, 0))
 	{
 		prepare_for_new_file(ctx);
-#ifdef ENABLE_SHARING
-		if (api_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 api_start(struct ccx_s_options api_options)
 			dec_ctx->timing->fts_now = 0;
 			dec_ctx->timing->fts_max = 0;
 
-#ifdef ENABLE_SHARING
-			if (api_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/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;