mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed starting a recording at an I-frame
This commit is contained in:
parent
ff858b78a3
commit
2db303d6f5
3
HISTORY
3
HISTORY
@ -6157,7 +6157,7 @@ Video Disk Recorder Revision History
|
|||||||
Reinhard Nissl).
|
Reinhard Nissl).
|
||||||
- Implemented full handling of subtitling descriptors (thanks to Mikko Tuumanen).
|
- Implemented full handling of subtitling descriptors (thanks to Mikko Tuumanen).
|
||||||
|
|
||||||
2009-11-06: Version 1.7.10
|
2009-11-15: Version 1.7.10
|
||||||
|
|
||||||
- Updated the Italian OSD texts (thanks to Diego Pierotto).
|
- Updated the Italian OSD texts (thanks to Diego Pierotto).
|
||||||
- Fixed wrong bracketing in cChannel::SubtitlingType() etc.
|
- Fixed wrong bracketing in cChannel::SubtitlingType() etc.
|
||||||
@ -6179,3 +6179,4 @@ Video Disk Recorder Revision History
|
|||||||
- Added Slovakian language texts (thanks to Milan Hrala).
|
- Added Slovakian language texts (thanks to Milan Hrala).
|
||||||
- Fixed EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0 (thanks
|
- Fixed EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0 (thanks
|
||||||
to Frank Schmirler).
|
to Frank Schmirler).
|
||||||
|
- Fixed starting a recording at an I-frame.
|
||||||
|
42
recorder.c
42
recorder.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: recorder.c 2.4 2009/05/23 12:18:25 kls Exp $
|
* $Id: recorder.c 2.5 2009/11/15 15:27:08 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "recorder.h"
|
#include "recorder.h"
|
||||||
@ -116,6 +116,7 @@ void cRecorder::Action(void)
|
|||||||
{
|
{
|
||||||
time_t t = time(NULL);
|
time_t t = time(NULL);
|
||||||
bool InfoWritten = false;
|
bool InfoWritten = false;
|
||||||
|
bool FirstIframeSeen = false;
|
||||||
while (Running()) {
|
while (Running()) {
|
||||||
int r;
|
int r;
|
||||||
uchar *b = ringBuffer->Get(r);
|
uchar *b = ringBuffer->Get(r);
|
||||||
@ -134,25 +135,28 @@ void cRecorder::Action(void)
|
|||||||
}
|
}
|
||||||
InfoWritten = true;
|
InfoWritten = true;
|
||||||
}
|
}
|
||||||
if (!NextFile())
|
if (FirstIframeSeen || frameDetector->IndependentFrame()) {
|
||||||
break;
|
FirstIframeSeen = true; // start recording with the first I-frame
|
||||||
if (index && frameDetector->NewFrame())
|
if (!NextFile())
|
||||||
index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
|
break;
|
||||||
if (frameDetector->IndependentFrame()) {
|
if (index && frameDetector->NewFrame())
|
||||||
recordFile->Write(patPmtGenerator.GetPat(), TS_SIZE);
|
index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
|
||||||
fileSize += TS_SIZE;
|
if (frameDetector->IndependentFrame()) {
|
||||||
int Index = 0;
|
recordFile->Write(patPmtGenerator.GetPat(), TS_SIZE);
|
||||||
while (uchar *pmt = patPmtGenerator.GetPmt(Index)) {
|
fileSize += TS_SIZE;
|
||||||
recordFile->Write(pmt, TS_SIZE);
|
int Index = 0;
|
||||||
fileSize += TS_SIZE;
|
while (uchar *pmt = patPmtGenerator.GetPmt(Index)) {
|
||||||
}
|
recordFile->Write(pmt, TS_SIZE);
|
||||||
|
fileSize += TS_SIZE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (recordFile->Write(b, Count) < 0) {
|
||||||
|
LOG_ERROR_STR(fileName->Name());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
fileSize += Count;
|
||||||
|
t = time(NULL);
|
||||||
}
|
}
|
||||||
if (recordFile->Write(b, Count) < 0) {
|
|
||||||
LOG_ERROR_STR(fileName->Name());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
fileSize += Count;
|
|
||||||
t = time(NULL);
|
|
||||||
}
|
}
|
||||||
ringBuffer->Del(Count);
|
ringBuffer->Del(Count);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user