Remove socket_upload tool

Author: sepnic

adapter/sink_alsa_wrapper.c

@@ -21,20 +21,10 @@
 #include <alsa/asoundlib.h>
 #include "cutils/memory_helper.h"
 #include "cutils/log_helper.h"
-#include "liteplayer_debug.h"
 #include "sink_alsa_wrapper.h"
 
 #define TAG "[liteplayer]alsa"
 
-//#define ENABLE_SOCKETUPLOAD
-
-#if defined(ENABLE_SOCKETUPLOAD)
-    // see tools/socket_upload.py
-    #define SOCKETUPLOAD_SERVER_ADDR  "127.0.0.1"
-    #define SOCKETUPLOAD_SERVER_PORT  22808
-    #define SOCKETUPLOAD_RINGBUF_SIZE (1024*256)
-#endif
-
 struct alsa_wrapper {
     snd_pcm_t *pcm;
     snd_output_t *log;
@@ -43,10 +33,6 @@ struct alsa_wrapper {
     snd_pcm_format_t format;
     size_t bits_per_sample;
     size_t bits_per_frame;
-
-#if defined(ENABLE_SOCKETUPLOAD)
-    socketupload_handle_t uploader;
-#endif
 };
 
 const char *alsa_wrapper_name()
@@ -62,12 +48,6 @@ sink_handle_t alsa_wrapper_open(int samplerate, int channels, int bits, void *pr
     if (alsa == NULL)
         return NULL;
 
-#if defined(ENABLE_SOCKETUPLOAD)
-    alsa->uploader = socketupload_init(SOCKETUPLOAD_RINGBUF_SIZE);
-    if (alsa->uploader == NULL) goto fail_open;
-    alsa->uploader->start(alsa->uploader, SOCKETUPLOAD_SERVER_ADDR, SOCKETUPLOAD_SERVER_PORT);
-#endif
-
     snd_pcm_hw_params_t *hwparams = NULL;
     uint32_t exact_rate = (uint32_t)samplerate;
     uint32_t buffer_time, period_time;
@@ -160,13 +140,6 @@ sink_handle_t alsa_wrapper_open(int samplerate, int channels, int bits, void *pr
     if (alsa->log != NULL)
         snd_output_close(alsa->log);
 
-#if defined(ENABLE_SOCKETUPLOAD)
-    if (alsa->uploader != NULL) {
-        alsa->uploader->destroy(alsa->uploader);
-        alsa->uploader = NULL;
-    }
-#endif
-
     OS_FREE(alsa);
     return NULL;
 }
@@ -175,11 +148,6 @@ int alsa_wrapper_write(sink_handle_t handle, char *buffer, int size)
 {
     struct alsa_wrapper *alsa = (struct alsa_wrapper *)handle;
 
-#if defined(ENABLE_SOCKETUPLOAD)
-    if (alsa->uploader != NULL)
-        alsa->uploader->fill_data(alsa->uploader, buffer, size);
-#endif
-
     size_t frame_count = (size_t)(size * 8 / alsa->bits_per_frame);
     unsigned char *data = (unsigned char *)buffer;
     ssize_t ret;
@@ -214,12 +182,5 @@ void alsa_wrapper_close(sink_handle_t handle)
     snd_pcm_drain(alsa->pcm);
     snd_pcm_close(alsa->pcm);
 
-#if defined(ENABLE_SOCKETUPLOAD)
-    if (alsa->uploader != NULL) {
-        alsa->uploader->stop(alsa->uploader);
-        alsa->uploader->destroy(alsa->uploader);
-    }
-#endif
-
     OS_FREE(alsa);
 }

example/unix/CMakeLists.txt

@@ -65,7 +65,6 @@ set(LITEPLAYER_CORE_SRC
     ${TOP_DIR}/src/liteplayer_adapter.c
     ${TOP_DIR}/src/liteplayer_source.c
     ${TOP_DIR}/src/liteplayer_parser.c
-    ${TOP_DIR}/src/liteplayer_debug.c
     ${TOP_DIR}/src/liteplayer_main.c
     ${TOP_DIR}/src/liteplayer_listplayer.c
     ${TOP_DIR}/src/liteplayer_ttsplayer.c

include/liteplayer_debug.h

@@ -33,7 +33,6 @@ set(LITEPLAYER_SRC
     ${TOP_DIR}/src/liteplayer_adapter.c
     ${TOP_DIR}/src/liteplayer_source.c
     ${TOP_DIR}/src/liteplayer_parser.c
-    ${TOP_DIR}/src/liteplayer_debug.c
     ${TOP_DIR}/src/liteplayer_main.c
     ${TOP_DIR}/src/liteplayer_listplayer.c
     ${TOP_DIR}/src/liteplayer_ttsplayer.c

src/CMakeLists.txt

@@ -37,12 +37,6 @@ extern "C" {
 #define DEFAULT_LISTPLAYER_TASK_PRIO             ( OS_THREAD_PRIO_HIGH )
 #define DEFAULT_LISTPLAYER_TASK_STACKSIZE        ( 1024*4 )
 
-// socket upload definations, for data dump, see tools/README.md
-#define DEFAULT_SOCKET_UPLOAD_START              "GENIE_SOCKET_UPLOAD_START"
-#define DEFAULT_SOCKET_UPLOAD_END                "GENIE_SOCKET_UPLOAD_END"
-#define DEFAULT_SOCKET_UPLOAD_TASK_PRIO          ( OS_THREAD_PRIO_NORMAL )
-#define DEFAULT_SOCKET_UPLOAD_TASK_STACKSIZE     ( 1024*2 )
-
 #ifdef __cplusplus
 }
 #endif