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

libspark/player, libeplayer3/ffmpeg: improve termination handling

Browse Source
This commit is contained in:
martii
2013-11-02 12:58:29 +01:00
parent eda54c7cea
commit 773553ddb5
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3/container/container_ffmpeg.c
View File

@@ -346,7 +346,7 @@ static void FFMPEGThread(Context_t *context) {
} }
ffmpeg_printf(10, "Running!\n"); ffmpeg_printf(10, "Running!\n");
while ( context && context->playback && context->playback->isPlaying ) { while ( context && context->playback && context->playback->isPlaying && !context->playback->abortRequested ) {
//IF MOVIE IS PAUSED, WAIT //IF MOVIE IS PAUSED, WAIT
if (context->playback->isPaused) { if (context->playback->isPaused) {

13
libspark/playback_libeplayer3.cpp
View File

@@ -15,7 +15,7 @@ extern ManagerHandler_t ManagerHandler;
#include "playback_libeplayer3.h" #include "playback_libeplayer3.h"
#include "subtitle.h" #include "subtitle.h"
static Context_t *player; static Context_t *player = NULL;
extern cAudio *audioDecoder; extern cAudio *audioDecoder;
extern cVideo *videoDecoder; extern cVideo *videoDecoder;
@@ -710,8 +710,17 @@ void cPlayback::SuspendSubtitle(bool b)
} }
void cPlayback::RequestAbort() { void cPlayback::RequestAbort() {
if (player->playback) if (player && player->playback) {
player->playback->abortRequested = 1; player->playback->abortRequested = 1;
while (player->playback->isPlaying)
usleep(100000);
}
}
bool cPlayback::isPlaying() {
if (player && player->playback)
return player->playback->isPlaying;
return false;
} }
#if 0 #if 0
bool cPlayback::IsPlaying(void) const bool cPlayback::IsPlaying(void) const

1
libspark/playback_libeplayer3.h
View File

@@ -48,6 +48,7 @@ class cPlayback
void FindAllDvbsubtitlePids(int *pids, unsigned int *numpids, std::string *language); void FindAllDvbsubtitlePids(int *pids, unsigned int *numpids, std::string *language);
void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage); void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage);
void RequestAbort(void); void RequestAbort(void);
bool isPlaying(void);
#if 0 #if 0
void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language); void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language);
bool SelectSubtitles(int pid); bool SelectSubtitles(int pid);