frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed manipulating an editing mark at the very end of a recording

Browse Source
This commit is contained in:
Klaus Schmidinger 2001-09-16 09:53:44 +02:00
parent 24883d3d23
commit e7ef8190c2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -752,3 +752,4 @@ Video Disk Recorder Revision History
- New version of the "Master-Timer" tool (thanks to Matthias Schniedermeyer). - New version of the "Master-Timer" tool (thanks to Matthias Schniedermeyer).
- Better error handling when writing configuration files. - Better error handling when writing configuration files.
- Fixed putting the final editing mark into the edited version's marks file. - Fixed putting the final editing mark into the edited version's marks file.
- Fixed manipulating an editing mark at the very end of a recording.

11
dvbapi.c
View File

@ -7,7 +7,7 @@
* DVD support initially written by Andreas Schultz <aschultz@warp10.net> * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si> * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
* *
* $Id: dvbapi.c 1.122 2001/09/16 09:35:51 kls Exp $ * $Id: dvbapi.c 1.123 2001/09/16 09:52:57 kls Exp $
*/ */
//#define DVDDEBUG 1 //#define DVDDEBUG 1
@ -284,7 +284,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
int d = Forward ? 1 : -1; int d = Forward ? 1 : -1;
for (;;) { for (;;) {
Index += d; Index += d;
if (Index >= 0 && Index <= last - 100) { // '- 100': need to stay off the end! if (Index >= 0 && Index <= last) {
if (index[Index].type == I_FRAME) { if (index[Index].type == I_FRAME) {
if (FileNumber) if (FileNumber)
*FileNumber = index[Index].number; *FileNumber = index[Index].number;
@ -2364,6 +2364,8 @@ void cCuttingBuffer::Action(void)
// Write one frame: // Write one frame:
if (PictureType == I_FRAME) { // every file shall start with an I_FRAME if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
if (!Mark) // edited version shall end before next I-frame
break;
if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) { if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
toFile = toFileName->NextFile(); toFile = toFileName->NextFile();
if (toFile < 0) if (toFile < 0)
@ -2391,8 +2393,9 @@ void cCuttingBuffer::Action(void)
Mark = fromMarks.Next(Mark); Mark = fromMarks.Next(Mark);
CurrentFileNumber = 0; // triggers SetOffset before reading next frame CurrentFileNumber = 0; // triggers SetOffset before reading next frame
} }
else // the 'else' case (i.e. 'final end mark reached') is handled above
break; // final end mark reached // in 'Write one frame', so that the edited version will end right
// before the next I-frame.
} }
} }
} }