mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 15:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

try to fix segfault on open/close

Browse Source
This commit is contained in:
Jacek Jendrzej
2019-07-22 19:48:51 +02:00
parent 42ac0f8229
commit e27822382d
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libarmbox/playback_libeplayer3.cpp
View File

@@ -24,6 +24,7 @@ static Context_t *player = NULL;
extern cAudio *audioDecoder;
extern cVideo *videoDecoder;
OpenThreads::Mutex cPlayback::mutex;
//Used by Fileplay
bool cPlayback::Open(playmode_t PlayMode)
@@ -50,9 +51,13 @@ bool cPlayback::Open(playmode_t PlayMode)
nPlaybackSpeed = 0;
init_jump = -1;
mutex.lock();
if (player)
{
free(player);
player = NULL;
player = NULL;
}
mutex.unlock();
player = (Context_t *) malloc(sizeof(Context_t));
@@ -82,8 +87,10 @@ void cPlayback::Close(void)
hal_info("%s\n", __func__);
//Dagobert: movieplayer does not call stop, it calls close ;)
mutex.lock();
if(playing)
Stop();
mutex.unlock();
if (decoders_closed)
{
@@ -765,27 +772,37 @@ cPlayback::~cPlayback()
{
hal_info("%s\n", __func__);
mutex.lock();
if (player)
{
free(player);
player = NULL;
player = NULL;
}
mutex.unlock();
}
void cPlayback::RequestAbort()
{
if (player && player->playback && player->playback->isPlaying)
if (player && player->playback)
{
hal_info("%s\n", __func__);
Stop();
//player->playback->abortRequested = 1;//why ?
mutex.lock();
if (player && player->playback && player->playback->isPlaying)
{
Stop();
player->playback->abortRequested = 1;
}
else if(player->playback->isHttp && !player->playback->isPlaying &&!player->playback->abortRequested)
{
player->playback->abortRequested = 1;
}
mutex.unlock();
while (player->playback->isPlaying)
usleep(100000);
}
else if(player->playback->isHttp && !player->playback->isPlaying &&!player->playback->abortRequested)
{
hal_info("%s\n", __func__);
player->playback->abortRequested = 1;
}
}
bool cPlayback::IsPlaying()

2
libarmbox/playback_libeplayer3.h
View File

@@ -3,6 +3,7 @@
#include <string>
#include <vector>
#include <OpenThreads/Mutex>
typedef enum
{
@@ -17,6 +18,7 @@ class cPlayback
friend class CStreamInfo2;
private:
static OpenThreads::Mutex mutex;
bool enabled;
bool playing, first;
bool no_probe;