frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed "attempt to drop wrong frame from ring buffer" when skipping +/- one minute during replay

This commit is contained in:
Klaus Schmidinger 2010-03-07 14:32:22 +01:00
parent 42928ff2d3
commit 6564d8e928
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -6406,3 +6406,5 @@ Video Disk Recorder Revision History
- Changed the polarization characters in cDvbSourceParam::GetOsdItem() to uppercase.
- The full timer file name is now displayed if it ends with "TITLE" or "EPISODE"
(pointed out by Udo Richter).
- Fixed "attempt to drop wrong frame from ring buffer" when skipping +/- one minute
during replay.

16
dvbplayer.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbplayer.c 2.20 2010/02/06 12:34:28 kls Exp $
* $Id: dvbplayer.c 2.21 2010/03/07 14:24:26 kls Exp $
*/
#include "dvbplayer.h"
@ -218,6 +218,7 @@ private:
bool readIndependent;
cFrame *readFrame;
cFrame *playFrame;
cFrame *dropFrame;
void TrickSpeed(int Increment);
void Empty(void);
bool NextFile(uint16_t FileNumber = 0, off_t FileOffset = -1);
@ -266,6 +267,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
readIndependent = false;
readFrame = NULL;
playFrame = NULL;
dropFrame = NULL;
isyslog("replay %s", FileName);
fileName = new cFileName(FileName, false, false, isPesRecording);
replayFile = fileName->Open();
@ -322,6 +324,7 @@ void cDvbPlayer::Empty(void)
delete readFrame; // might not have been stored in the buffer in Action()
readFrame = NULL;
playFrame = NULL;
dropFrame = NULL;
ringBuffer->Clear();
ptsIndex.Clear();
DeviceClear();
@ -396,7 +399,6 @@ void cDvbPlayer::Action(void)
uint32_t LastStc = 0;
int LastReadIFrame = -1;
int SwitchToPlayFrame = 0;
cFrame *DropFrame = NULL;
while (Running()) {
if (WaitingForData)
@ -503,10 +505,10 @@ void cDvbPlayer::Action(void)
else
Sleep = true;
if (DropFrame) {
if (!eof || (playDir != pdForward && DropFrame->Index() > 0) || (playDir == pdForward && DropFrame->Index() < readIndex)) {
ringBuffer->Drop(DropFrame); // the very first and last frame are continously repeated to flush data through the device
DropFrame = NULL;
if (dropFrame) {
if (!eof || (playDir != pdForward && dropFrame->Index() > 0) || (playDir == pdForward && dropFrame->Index() < readIndex)) {
ringBuffer->Drop(dropFrame); // the very first and last frame are continously repeated to flush data through the device
dropFrame = NULL;
}
}
@ -554,7 +556,7 @@ void cDvbPlayer::Action(void)
Sleep = true;
}
if (pc <= 0) {
DropFrame = playFrame;
dropFrame = playFrame;
playFrame = NULL;
p = NULL;
}