mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 15:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove isContainerRunning, this break next file play aufter eof stop

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 216e1f37cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-02-10 (Sat, 10 Feb 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2018-02-10 20:41:24 +01:00
committed by max_10
parent 712542335e
commit 53e6502bb1
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libeplayer3-arm/container/container_ffmpeg.c
View File

@@ -127,8 +127,6 @@ static AVFormatContext *avContextTab[IPTV_AV_CONTEXT_MAX_NUM] = {NULL, NULL};
static int32_t use_custom_io[IPTV_AV_CONTEXT_MAX_NUM] = {0, 0}; static int32_t use_custom_io[IPTV_AV_CONTEXT_MAX_NUM] = {0, 0};
static AVDictionary *avio_opts = NULL; static AVDictionary *avio_opts = NULL;
static uint8_t isContainerRunning = 0;
static int64_t latestPts = 0; static int64_t latestPts = 0;
static int32_t restart_audio_resampling = 0; static int32_t restart_audio_resampling = 0;
@@ -1626,12 +1624,6 @@ int32_t container_ffmpeg_init(Context_t *context, PlayFiles_t *playFilesNames)
{ {
ffmpeg_printf(10, "second filename %s\n", playFilesNames->szSecondFile); ffmpeg_printf(10, "second filename %s\n", playFilesNames->szSecondFile);
} }
if (isContainerRunning)
{
ffmpeg_err("ups already running?\n");
releaseMutex(__FILE__, __FUNCTION__, __LINE__);
return cERR_CONTAINER_FFMPEG_RUNNING;
}
/* initialize ffmpeg */ /* initialize ffmpeg */
avcodec_register_all(); avcodec_register_all();
av_register_all(); av_register_all();
@@ -1656,7 +1648,6 @@ int32_t container_ffmpeg_init(Context_t *context, PlayFiles_t *playFilesNames)
} }
terminating = 0; terminating = 0;
latestPts = 0; latestPts = 0;
isContainerRunning = 1;
res = container_ffmpeg_update_tracks(context, playFilesNames->szFirstFile, 1); res = container_ffmpeg_update_tracks(context, playFilesNames->szFirstFile, 1);
return res; return res;
} }
@@ -2241,11 +2232,6 @@ static int32_t container_ffmpeg_stop(Context_t *context)
* and causes in most cases a segfault * and causes in most cases a segfault
*/ */
ffmpeg_printf(10, "\n"); ffmpeg_printf(10, "\n");
if (!isContainerRunning)
{
ffmpeg_err("Container not running\n");
return cERR_CONTAINER_FFMPEG_ERR;
}
if (context->playback) if (context->playback)
{ {
context->playback->isPlaying = 0; context->playback->isPlaying = 0;
@@ -2298,7 +2284,6 @@ static int32_t container_ffmpeg_stop(Context_t *context)
{ {
av_dict_free(&avio_opts); av_dict_free(&avio_opts);
} }
isContainerRunning = 0;
avformat_network_deinit(); avformat_network_deinit();
ffmpeg_buf_free(); ffmpeg_buf_free();
releaseMutex(__FILE__, __FUNCTION__, __LINE__); releaseMutex(__FILE__, __FUNCTION__, __LINE__);