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

libeplayer3/container_ffmpeg: don't flush instead of clear

Browse Source
This commit is contained in:
martii
2013-07-27 12:24:50 +02:00
parent b64bdcb370
commit c9e0755f02
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3/container/container_ffmpeg.c
View File

@@ -521,7 +521,7 @@ static void FFMPEGThread(Context_t *context) {
avcodec_free_frame(&decoded_frame); avcodec_free_frame(&decoded_frame);
decoded_frame = NULL; decoded_frame = NULL;
} }
context->output->Command(context, OUTPUT_FLUSH, NULL); context->output->Command(context, OUTPUT_CLEAR, NULL);
context->output->Command(context, OUTPUT_PLAY, NULL); context->output->Command(context, OUTPUT_PLAY, NULL);
} }

10
libeplayer3/output/linuxdvb.c
View File

@@ -473,18 +473,18 @@ int LinuxDvbFlush(Context_t *context __attribute__((unused)), char * type) {
getLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__); getLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__);
if (video && videofd != -1) { if (video && videofd != -1) {
if (ioctl(videofd, VIDEO_CLEAR_BUFFER) == -1) if (ioctl(videofd, VIDEO_FLUSH, NULL) == -1)
{ {
linuxdvb_err("ioctl failed with errno %d\n", errno); linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("VIDEO_CLEAR_BUFFER: %s\n", strerror(errno)); linuxdvb_err("VIDEO_FLUSH: %s\n", strerror(errno));
} }
} }
if (audio && audiofd != -1) { if (audio && audiofd != -1) {
if (ioctl(audiofd, AUDIO_CLEAR_BUFFER) == -1) if (ioctl(audiofd, AUDIO_FLUSH, NULL) == -1)
{ {
linuxdvb_err("ioctl failed with errno %d\n", errno); linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("AUDIO_CLEAR_BUFFER: %s\n", strerror(errno)); linuxdvb_err("AUDIO_FLUSH: %s\n", strerror(errno));
} }
} }
@@ -1082,6 +1082,8 @@ static int Command(void *_context, OutputCmd_t command, void * argument) {
} }
case OUTPUT_CLEAR: { case OUTPUT_CLEAR: {
ret = LinuxDvbClear(context, (char*)argument); ret = LinuxDvbClear(context, (char*)argument);
reset(context);
sCURRENT_PTS = 0;
break; break;
} }
case OUTPUT_PTS: { case OUTPUT_PTS: {