From 193a2d305cc642d21ee5e2c47a51569744e088d8 Mon Sep 17 00:00:00 2001 From: samsamsam Date: Sat, 7 Apr 2018 17:48:05 +0200 Subject: [PATCH] Fix wrong playback file name Signed-off-by: max_10 --- libeplayer3-arm/main/exteplayer.c | 5 ++++- libeplayer3-arm/output/linuxdvb_buffering.c | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libeplayer3-arm/main/exteplayer.c b/libeplayer3-arm/main/exteplayer.c index 85ab823..b2065de 100644 --- a/libeplayer3-arm/main/exteplayer.c +++ b/libeplayer3-arm/main/exteplayer.c @@ -575,6 +575,7 @@ static int ParseParams(int argc, char *argv[], PlayFiles_t *playbackFiles, int * if (optarg[0] != '\0') { playbackFiles->szSecondFile = malloc(IPTV_MAX_FILE_PATH); + playbackFiles->szSecondFile[0] = '\0'; strncpy(playbackFiles->szSecondFile, optarg, IPTV_MAX_FILE_PATH - 1); playbackFiles->szSecondFile[IPTV_MAX_FILE_PATH] = '\0'; map_inter_file_path(playbackFiles->szSecondFile); @@ -639,6 +640,7 @@ static int ParseParams(int argc, char *argv[], PlayFiles_t *playbackFiles, int * if (optarg[0] != '\0') { playbackFiles->szFirstMoovAtomFile = malloc(IPTV_MAX_FILE_PATH); + playbackFiles->szFirstMoovAtomFile[0] = '\0'; strncpy(playbackFiles->szFirstMoovAtomFile, optarg, IPTV_MAX_FILE_PATH - 1); playbackFiles->szFirstMoovAtomFile[IPTV_MAX_FILE_PATH] = '\0'; map_inter_file_path(playbackFiles->szFirstMoovAtomFile); @@ -654,6 +656,7 @@ static int ParseParams(int argc, char *argv[], PlayFiles_t *playbackFiles, int * { ret = 0; playbackFiles->szFirstFile = malloc(IPTV_MAX_FILE_PATH); + playbackFiles->szFirstFile[0] = '\0'; if (NULL == strstr(argv[optind], "://")) { strcpy(playbackFiles->szFirstFile, "file://"); @@ -685,7 +688,7 @@ int main(int argc, char *argv[]) memset(argvBuff, '\0', sizeof(argvBuff)); int commandRetVal = -1; /* inform client that we can handle additional commands */ - fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 46); + fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 47); PlayFiles_t playbackFiles; memset(&playbackFiles, 0x00, sizeof(playbackFiles)); diff --git a/libeplayer3-arm/output/linuxdvb_buffering.c b/libeplayer3-arm/output/linuxdvb_buffering.c index 2fc472f..f66b471 100644 --- a/libeplayer3-arm/output/linuxdvb_buffering.c +++ b/libeplayer3-arm/output/linuxdvb_buffering.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "common.h" #include "misc.h" @@ -309,8 +310,13 @@ int32_t LinuxDvbBuffClose(Context_t *context __attribute__((unused))) pthread_cond_signal(&bufferingdDataAddedCond); /* wait for thread end */ +#if 0 + /* This code couse symbol versioning of clock_gettime@GLIBC_2.17 */ clock_gettime(CLOCK_REALTIME, &max_wait); max_wait.tv_sec += 1; +#else + max_wait.tv_sec = time(NULL) + 2; +#endif pthread_cond_timedwait(&bufferingExitCond, &bufferingMtx, &max_wait); pthread_mutex_unlock(&bufferingMtx);