mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
VDR developer version 1.7.32 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.32.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.31-1.7.32.diff MD5 checksums: 068ba78fd427694dcc480fe3b2d07148 vdr-1.7.32.tar.bz2 222f1e9b4d4edaa6fe57286409614cc7 vdr-1.7.31-1.7.32.diff WARNING: ======== This is a developer version. Even though I use it in my productive environment. I strongly recommend that you only use it under controlled conditions and for testing and debugging. The main focus of this version is on an improved frame detection code, and improvements to the cutting process. When cutting a recording, VDR now removes any "dangling" TS packets from the beginning of an editing sequence and pulls in any "pending" TS packets at the end of a sequence. It also fixes all timestamps and continuity counters. However, while the results look much better now in, for instance, Kaffeine, the TT S2-6400 still shows some video artifacts at the editing points, and the Mac video player sometimes totally chokes on edited material. I did spend a lot of time trying to find out what could still be wrong here, but couldn't come up with any new ideas. So I think it's now time to invite others to test this new cutting code, read the source code and try to find out what's still going wrong here. Maybe (hopefully ;-) it's just some stupid little error... ;-) From the HISTORY file: - Pressing the Play key during normal live viewing mode now opens the Recordings menu if there is no "last viewed" recording (thanks to Alexander Wenzel). The same behavior has been implemented for the Blue key in the main menu. - cIoThrottle::Engaged() is now also checked in cRemoveDeletedRecordingsThread::Action(), to suspend removing deleted recordings in case this is necessary to make room for new, ongoing recordings (suggested by Udo Richter). - The cThread constructor now has an additional boolean parameter that can be set to true to have this thread run at a lower priority. Plugin authors that use low priority threads may want to use this instead of the calls to SetPriority(19) and SetIOPriority(7). The priority of a thread ("low" or "high") is now logged when the thread starts. - Changed DTV_DVBT2_PLP_ID to DTV_STREAM_ID in dvbdevice.c to adapt to an incompatible change in DVB API 5.8 (reported by Derek Kelly). Removed the meanwhile obsolete definition of FE_CAN_TURBO_FEC. - Fixed some compiler warnings under gcc version 4.7.1. - Fixed setting the video format in the dvbhdffdevice (thanks to Torsten Lang). - Fixed 'make install' to not overwrite existing configuration files (thanks to Peter Münster). - Added including the Make.global and Make.config files to the dvbdhffdevice's libhdffcmd/Makefile. - Added options to build a 32-bit version of VDR on a 64-bit machine to Make.config.template. - Fixed handling VPS timers in case the running status of an event goes to '1' (not running) and later goes to '4' (running). - If a frame position in the 'marks' file of a recording doesn't point to an I-frame, it will now be shifted towards the next I-frame, either up or down, whichever is closer (suggested by Udo Richter). - Fixed a possible memory leak in SI::StructureLoop::getNextAsPointer() (reported by Sundararaj Reel). - Fixed handling timers in case an event is modified and "phased out" while the timer is recording. - Improved frame detection by parsing just far enough into the MPEG-4 NAL units to get the necessary information about frames and slices. - The initial syncing of the frame detector is now done immediately after the first complete GOP has been seen. This makes recordings and especially pausing live video start up to twice as fast as before. - Updated the Romanian OSD texts (thanks to Lucian Muresan). - Fixed handling the very last entry in a recording index. - The return type of cMarks::Add() has been changed to void, since due to the sorting of the list of marks the returned pointer might have pointed to a totally different mark. Besides, the return value was never actually used. - Improved editing TS recordings by + stripping dangling TS packets from the beginning of a sequence + including pending TS packets at the end of a sequence + fixing all timestamps and continuity counters + generating editing marks for the edited version in such a way that each cutting point is marked by an "end" and "begin" mark with the same offset + no longer generating an editing mark at the "end" of the edited recording (this was actually generated at the beginning of the last GOP, so that a subsequent edit would have cut off the last GOP) + no longer generating any editing marks if the edited recording results on just one single sequence + ignoring pairs of editing marks that are placed at exactly the same position of a recording when actually cutting the recording + not doing anything if the editing marks in place would result in the edited version being the same as the original recording - Editing marks can now be placed directly on top of each other, in which case they simply mark a position, but have no effect on the actual cutting process. - When positioned at an offset where two (or more) editing marks are placed on top of each other, the '4' key moves the first one of them to the left, while the '6' key moves the last one of them to the right. The '7' and '9' key handle multiple marks at the same place as if it were one single mark. - Modified editing marks are now written to disk whenever the replay progress display gets hidden (thanks to Christoph Haubrich).
373 lines
14 KiB
C++
373 lines
14 KiB
C++
/*
|
|
* recording.h: Recording file handling
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: recording.h 2.40 2012/11/13 11:43:59 kls Exp $
|
|
*/
|
|
|
|
#ifndef __RECORDING_H
|
|
#define __RECORDING_H
|
|
|
|
#include <time.h>
|
|
#include "channels.h"
|
|
#include "config.h"
|
|
#include "epg.h"
|
|
#include "thread.h"
|
|
#include "timers.h"
|
|
#include "tools.h"
|
|
|
|
#define FOLDERDELIMCHAR '~'
|
|
#define TIMERMACRO_TITLE "TITLE"
|
|
#define TIMERMACRO_EPISODE "EPISODE"
|
|
|
|
extern bool VfatFileSystem;
|
|
extern int InstanceId;
|
|
|
|
void RemoveDeletedRecordings(void);
|
|
void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
|
|
///< The special Priority value -1 means that we shall get rid of any
|
|
///< deleted recordings faster than normal (because we're cutting).
|
|
///< If Force is true, the check will be done even if the timeout
|
|
///< hasn't expired yet.
|
|
|
|
class cResumeFile {
|
|
private:
|
|
char *fileName;
|
|
bool isPesRecording;
|
|
public:
|
|
cResumeFile(const char *FileName, bool IsPesRecording);
|
|
~cResumeFile();
|
|
int Read(void);
|
|
bool Save(int Index);
|
|
void Delete(void);
|
|
};
|
|
|
|
class cRecordingInfo {
|
|
friend class cRecording;
|
|
private:
|
|
tChannelID channelID;
|
|
char *channelName;
|
|
const cEvent *event;
|
|
cEvent *ownEvent;
|
|
char *aux;
|
|
double framesPerSecond;
|
|
int priority;
|
|
int lifetime;
|
|
char *fileName;
|
|
cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
|
|
bool Read(FILE *f);
|
|
void SetData(const char *Title, const char *ShortText, const char *Description);
|
|
void SetAux(const char *Aux);
|
|
public:
|
|
cRecordingInfo(const char *FileName);
|
|
~cRecordingInfo();
|
|
tChannelID ChannelID(void) const { return channelID; }
|
|
const char *ChannelName(void) const { return channelName; }
|
|
const cEvent *GetEvent(void) const { return event; }
|
|
const char *Title(void) const { return event->Title(); }
|
|
const char *ShortText(void) const { return event->ShortText(); }
|
|
const char *Description(void) const { return event->Description(); }
|
|
const cComponents *Components(void) const { return event->Components(); }
|
|
const char *Aux(void) const { return aux; }
|
|
double FramesPerSecond(void) const { return framesPerSecond; }
|
|
void SetFramesPerSecond(double FramesPerSecond);
|
|
bool Write(FILE *f, const char *Prefix = "") const;
|
|
bool Read(void);
|
|
bool Write(void) const;
|
|
};
|
|
|
|
class cRecording : public cListObject {
|
|
friend class cRecordings;
|
|
private:
|
|
mutable int resume;
|
|
mutable char *titleBuffer;
|
|
mutable char *sortBufferName;
|
|
mutable char *sortBufferTime;
|
|
mutable char *fileName;
|
|
mutable char *name;
|
|
mutable int fileSizeMB;
|
|
mutable int numFrames;
|
|
int channel;
|
|
int instanceId;
|
|
bool isPesRecording;
|
|
mutable int isOnVideoDirectoryFileSystem; // -1 = unknown, 0 = no, 1 = yes
|
|
double framesPerSecond;
|
|
cRecordingInfo *info;
|
|
cRecording(const cRecording&); // can't copy cRecording
|
|
cRecording &operator=(const cRecording &); // can't assign cRecording
|
|
static char *StripEpisodeName(char *s);
|
|
char *SortName(void) const;
|
|
int GetResume(void) const;
|
|
time_t start;
|
|
int priority;
|
|
int lifetime;
|
|
time_t deleted;
|
|
public:
|
|
cRecording(cTimer *Timer, const cEvent *Event);
|
|
cRecording(const char *FileName);
|
|
virtual ~cRecording();
|
|
time_t Start(void) const { return start; }
|
|
int Priority(void) const { return priority; }
|
|
int Lifetime(void) const { return lifetime; }
|
|
time_t Deleted(void) const { return deleted; }
|
|
virtual int Compare(const cListObject &ListObject) const;
|
|
const char *Name(void) const { return name; }
|
|
const char *FileName(void) const;
|
|
const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
|
|
const cRecordingInfo *Info(void) const { return info; }
|
|
const char *PrefixFileName(char Prefix);
|
|
int HierarchyLevels(void) const;
|
|
void ResetResume(void) const;
|
|
double FramesPerSecond(void) const { return framesPerSecond; }
|
|
int NumFrames(void) const;
|
|
///< Returns the number of frames in this recording.
|
|
///< If the number of frames is unknown, -1 will be returned.
|
|
int LengthInSeconds(void) const;
|
|
///< Returns the length (in seconds) of this recording, or -1 in case of error.
|
|
int FileSizeMB(void) const;
|
|
///< Returns the total file size of this recording (in MB), or -1 if the file
|
|
///< size is unknown.
|
|
bool IsNew(void) const { return GetResume() <= 0; }
|
|
bool IsEdited(void) const;
|
|
bool IsPesRecording(void) const { return isPesRecording; }
|
|
bool IsOnVideoDirectoryFileSystem(void) const;
|
|
void ReadInfo(void);
|
|
bool WriteInfo(void);
|
|
void SetStartTime(time_t Start);
|
|
///< Sets the start time of this recording to the given value.
|
|
///< If a filename has already been set for this recording, it will be
|
|
///< deleted and a new one will be generated (using the new start time)
|
|
///< at the next call to FileName().
|
|
///< Use this function with care - it does not check whether a recording with
|
|
///< this new name already exists, and if there is one, results may be
|
|
///< unexpected!
|
|
bool Delete(void);
|
|
///< Changes the file name so that it will no longer be visible in the "Recordings" menu
|
|
///< Returns false in case of error
|
|
bool Remove(void);
|
|
///< Actually removes the file from the disk
|
|
///< Returns false in case of error
|
|
bool Undelete(void);
|
|
///< Changes the file name so that it will be visible in the "Recordings" menu again and
|
|
///< not processed by cRemoveDeletedRecordingsThread.
|
|
///< Returns false in case of error
|
|
};
|
|
|
|
class cRecordings : public cList<cRecording>, public cThread {
|
|
private:
|
|
static char *updateFileName;
|
|
bool deleted;
|
|
time_t lastUpdate;
|
|
int state;
|
|
const char *UpdateFileName(void);
|
|
void Refresh(bool Foreground = false);
|
|
void ScanVideoDir(const char *DirName, bool Foreground = false, int LinkLevel = 0);
|
|
protected:
|
|
void Action(void);
|
|
public:
|
|
cRecordings(bool Deleted = false);
|
|
virtual ~cRecordings();
|
|
bool Load(void) { return Update(true); }
|
|
///< Loads the current list of recordings and returns true if there
|
|
///< is anything in it (for compatibility with older plugins - use
|
|
///< Update(true) instead).
|
|
bool Update(bool Wait = false);
|
|
///< Triggers an update of the list of recordings, which will run
|
|
///< as a separate thread if Wait is false. If Wait is true, the
|
|
///< function returns only after the update has completed.
|
|
///< Returns true if Wait is true and there is anything in the list
|
|
///< of recordings, false otherwise.
|
|
void TouchUpdate(void);
|
|
///< Touches the '.update' file in the video directory, so that other
|
|
///< instances of VDR that access the same video directory can be triggered
|
|
///< to update their recordings list.
|
|
bool NeedsUpdate(void);
|
|
void ChangeState(void) { state++; }
|
|
bool StateChanged(int &State);
|
|
void ResetResume(const char *ResumeFileName = NULL);
|
|
cRecording *GetByName(const char *FileName);
|
|
void AddByName(const char *FileName, bool TriggerUpdate = true);
|
|
void DelByName(const char *FileName);
|
|
void UpdateByName(const char *FileName);
|
|
int TotalFileSizeMB(void);
|
|
double MBperMinute(void);
|
|
///< Returns the average data rate (in MB/min) of all recordings, or -1 if
|
|
///< this value is unknown.
|
|
};
|
|
|
|
extern cRecordings Recordings;
|
|
extern cRecordings DeletedRecordings;
|
|
|
|
#define DEFAULTFRAMESPERSECOND 25.0
|
|
|
|
class cMark : public cListObject {
|
|
friend class cMarks; // for sorting
|
|
private:
|
|
double framesPerSecond;
|
|
int position;
|
|
cString comment;
|
|
public:
|
|
cMark(int Position = 0, const char *Comment = NULL, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
|
|
virtual ~cMark();
|
|
int Position(void) const { return position; }
|
|
const char *Comment(void) const { return comment; }
|
|
void SetPosition(int Position) { position = Position; }
|
|
void SetComment(const char *Comment) { comment = Comment; }
|
|
cString ToText(void);
|
|
bool Parse(const char *s);
|
|
bool Save(FILE *f);
|
|
};
|
|
|
|
class cMarks : public cConfig<cMark> {
|
|
private:
|
|
cString recordingFileName;
|
|
cString fileName;
|
|
double framesPerSecond;
|
|
bool isPesRecording;
|
|
time_t nextUpdate;
|
|
time_t lastFileTime;
|
|
time_t lastChange;
|
|
public:
|
|
bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
|
|
bool Update(void);
|
|
void Align(void);
|
|
void Sort(void);
|
|
void Add(int Position);
|
|
cMark *Get(int Position);
|
|
cMark *GetPrev(int Position);
|
|
cMark *GetNext(int Position);
|
|
cMark *GetNextBegin(cMark *EndMark = NULL);
|
|
///< Returns the next "begin" mark after EndMark, skipping any marks at the
|
|
///< same position as EndMark. If EndMark is NULL, the first actual "begin"
|
|
///< will be returned (if any).
|
|
cMark *GetNextEnd(cMark *BeginMark);
|
|
///< Returns the next "end" mark after BeginMark, skipping any marks at the
|
|
///< same position as BeginMark.
|
|
int GetNumSequences(void);
|
|
///< Returns the actual number of sequences to be cut from the recording.
|
|
///< If there is only one actual "begin" mark, and it is positioned at index
|
|
///< 0 (the beginning of the recording), and there is no "end" mark, the
|
|
///< return value is 0, which means that the result is the same as the original
|
|
///< recording.
|
|
};
|
|
|
|
#define RUC_BEFORERECORDING "before"
|
|
#define RUC_AFTERRECORDING "after"
|
|
#define RUC_EDITEDRECORDING "edited"
|
|
#define RUC_DELETERECORDING "deleted"
|
|
|
|
class cRecordingUserCommand {
|
|
private:
|
|
static const char *command;
|
|
public:
|
|
static void SetCommand(const char *Command) { command = Command; }
|
|
static void InvokeCommand(const char *State, const char *RecordingFileName, const char *SourceFileName = NULL);
|
|
};
|
|
|
|
// The maximum size of a single frame (up to HDTV 1920x1080):
|
|
#define MAXFRAMESIZE (KILOBYTE(1024) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE to avoid breaking up TS packets
|
|
|
|
// The maximum file size is limited by the range that can be covered
|
|
// with a 40 bit 'unsigned int', which is 1TB. The actual maximum value
|
|
// used is 6MB below the theoretical maximum, to have some safety (the
|
|
// actual file size may be slightly higher because we stop recording only
|
|
// before the next independent frame, to have a complete Group Of Pictures):
|
|
#define MAXVIDEOFILESIZETS 1048570 // MB
|
|
#define MAXVIDEOFILESIZEPES 2000 // MB
|
|
#define MINVIDEOFILESIZE 100 // MB
|
|
#define MAXVIDEOFILESIZEDEFAULT MAXVIDEOFILESIZEPES
|
|
|
|
struct tIndexTs;
|
|
class cIndexFileGenerator;
|
|
|
|
class cIndexFile {
|
|
private:
|
|
int f;
|
|
cString fileName;
|
|
int size, last;
|
|
tIndexTs *index;
|
|
bool isPesRecording;
|
|
cResumeFile resumeFile;
|
|
cIndexFileGenerator *indexFileGenerator;
|
|
cMutex mutex;
|
|
static cMutex indexListMutex;
|
|
static cVector<const cIndexFile *> indexList;
|
|
static void AddToIndexList(const cIndexFile *IndexFile);
|
|
static void RemoveFromIndexList(const cIndexFile *IndexFile);
|
|
static bool IsInIndexList(const cIndexFile *IndexFile);
|
|
void ConvertFromPes(tIndexTs *IndexTs, int Count);
|
|
void ConvertToPes(tIndexTs *IndexTs, int Count);
|
|
bool CatchUp(int Index = -1);
|
|
public:
|
|
cIndexFile(const char *FileName, bool Record, bool IsPesRecording = false, bool PauseLive = false);
|
|
~cIndexFile();
|
|
bool Ok(void) { return index != NULL; }
|
|
bool Write(bool Independent, uint16_t FileNumber, off_t FileOffset);
|
|
bool Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *Independent = NULL, int *Length = NULL);
|
|
int GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber = NULL, off_t *FileOffset = NULL, int *Length = NULL);
|
|
int GetClosestIFrame(int Index);
|
|
///< Returns the index of the I-frame that is closest to the given Index (or Index itself,
|
|
///< if it already points to an I-frame). Index may be any value, even outside the current
|
|
///< range of frame indexes.
|
|
///< If there is no actual index data available, 0 is returned.
|
|
int Get(uint16_t FileNumber, off_t FileOffset);
|
|
int Last(void) { CatchUp(); return last; }
|
|
///< Returns the index of the last entry in this file, or -1 if the file is empty.
|
|
int GetResume(void) { return resumeFile.Read(); }
|
|
bool StoreResume(int Index) { return resumeFile.Save(Index); }
|
|
bool IsStillRecording(void);
|
|
void Delete(void);
|
|
static int GetLength(const char *FileName, bool IsPesRecording = false);
|
|
///< Calculates the recording length (number of frames) without actually reading the index file.
|
|
///< Returns -1 in case of error.
|
|
static cString IndexFileName(const char *FileName, bool IsPesRecording);
|
|
};
|
|
|
|
class cFileName {
|
|
private:
|
|
cUnbufferedFile *file;
|
|
uint16_t fileNumber;
|
|
char *fileName, *pFileNumber;
|
|
bool record;
|
|
bool blocking;
|
|
bool isPesRecording;
|
|
public:
|
|
cFileName(const char *FileName, bool Record, bool Blocking = false, bool IsPesRecording = false);
|
|
~cFileName();
|
|
const char *Name(void) { return fileName; }
|
|
uint16_t Number(void) { return fileNumber; }
|
|
bool GetLastPatPmtVersions(int &PatVersion, int &PmtVersion);
|
|
cUnbufferedFile *Open(void);
|
|
void Close(void);
|
|
cUnbufferedFile *SetOffset(int Number, off_t Offset = 0); // yes, Number is int for easier internal calculating
|
|
cUnbufferedFile *NextFile(void);
|
|
};
|
|
|
|
cString IndexToHMSF(int Index, bool WithFrame = false, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
|
|
// Converts the given index to a string, optionally containing the frame number.
|
|
int HMSFToIndex(const char *HMSF, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
|
|
// Converts the given string (format: "hh:mm:ss.ff") to an index.
|
|
int SecondsToFrames(int Seconds, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
|
|
// Returns the number of frames corresponding to the given number of seconds.
|
|
|
|
int ReadFrame(cUnbufferedFile *f, uchar *b, int Length, int Max);
|
|
|
|
char *ExchangeChars(char *s, bool ToFileSystem);
|
|
// Exchanges the characters in the given string to or from a file system
|
|
// specific representation (depending on ToFileSystem). The given string will
|
|
// be modified and may be reallocated if more space is needed. The return
|
|
// value points to the resulting string, which may be different from s.
|
|
|
|
bool GenerateIndex(const char *FileName);
|
|
|
|
enum eRecordingsSortMode { rsmName, rsmTime };
|
|
extern eRecordingsSortMode RecordingsSortMode;
|
|
bool HasRecordingsSortMode(const char *Directory);
|
|
void GetRecordingsSortMode(const char *Directory);
|
|
void SetRecordingsSortMode(const char *Directory, eRecordingsSortMode SortMode);
|
|
void IncRecordingsSortMode(const char *Directory);
|
|
|
|
#endif //__RECORDING_H
|