mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
VDR developer version 2.3.1 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.1.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.2.0-2.3.1.diff MD5 checksums: 391c2ed60e2f7d24563fe3ed5854bc4f vdr-2.3.1.tar.bz2 983fd4bad7d19cd98301d54173107129 vdr-2.2.0-2.3.1.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. *** PLEASE BE VERY CAREFUL WHEN USING THIS DEVELOPER VERSION, ESPECIALLY *** IF YOU ENABLE THE NEW SVDRP PEERING! KEEP BACKUPS OF ALL YOUR TIMERS *** AND OBSERVE VERY CLOSELY WHETHER EVERYTHING WORKS AS EXPECTED. THIS *** VERSION INTRODUCES SOME MAJOR CHANGES IN HANDLING GLOBAL LISTS AND *** LOCKING, SO ANYTHING CAN HAPPEN! YOU HAVE BEEN WARNED! The main focus of this developer version is on the new locking mechanism for global lists, and the ability to handle remote timers. Any plugins that access the global lists of timers, channels, schedules or recordings, will need to be adjusted (see below for details). Please do initial tests with plain vanilla VDR and just the output plugin you need. Known bugs/problems: - After deleting the last recording in a sub folder, the cursor may not be positioned correctly. - Instant recordings and pausing live video don't (yet) use the default SVDRP host for recording. From the HISTORY file: - The new function cOsd::MaxPixmapSize() can be called to determine the maximum size a cPixmap may have on the current OSD. The 'osddemo' example has been modified accordingly. Plugin authors may want to use this function in case they use pixmaps that are larger than the full OSD size. The default implementation sets this limit to 2048x2048 pixel. - The Setup/CAM menu now displays which device an individual CAM is currently assigned to (suggested by Frank Neumann). - Added detection of 24fps (thanks to Thomas Reufer). - Added a note about the VDR User Counter and VDR's facebook page to the README file. - The dvbhddevice plugin is no longer part of the VDR source archive. You can get the latest version of this plugin from the author's repository at https://bitbucket.org/powARman/dvbhddevice. - The dvbsddevice and rcu plugins are no longer part of the VDR source archive. You can get the latest versions of these plugins from ftp://ftp.tvdr.de/vdr/Plugins. - Added a section about Output Devices to the INSTALL file. - Fixed setting the source value of newly created channels, in case the NIT is received from a different, but very close satellite position (reported by Daniel Ribeiro). The code for handling different NITs has been removed from nit.c, because according to the DVB standard table id 0x40 carries only the NIT of the actual network. - Added some comment to cPixmap about the relation between OSD, ViewPort and DrawPort (suggested by Thomas Reufer). - Improved syncing on sections when parsing the NIT and SDT. - Fixed scaling subtitles (their areas could sometimes extend outside the actual OSD). - Reduced the priority of the "video directory scanner" thread (suggested by Thomas Reufer) and checking cIoThrottle::Engaged() when it is running. - The script that gets called for recordings is now also called right before a recording is edited, with the first parameter being "editing" (suggested by Dieter Ferdinand). - The new setup option "OSD/Default sort mode for recordings" can be used to define how recordings shall be sorted by default (either by time or by name, with "by time" being the default). If a particular sort mode has been selected for a folder by pressing '0', the default no longer applies to that folder. Repeating timers no longer write a ".sort" file into a recordings folder to have the recordings sorted by time. - The command line option -D now accepts the value '-' (as in -D-), which prevents VDR from using any DVB devices (suggested by Dietmar Spingler). - The -V and -h options now list the plugins in alphabetical order (suggested by Dietmar Spingler). - Fixed a compiler warning in font.c. - Commented out the line #define DEPRECATED_VIDEOSYSTEM in device.h. If a plugin doesn't compile with this version of VDR, you can uncomment this line as a quick workaround. In the long run the plugin will need to be adapted. - The function cOsd::GetBitmap() is now 'protected'. If a plugin doesn't compile with this version of VDR, you can uncomment the line //#define DEPRECATED_GETBITMAP in osd.h as a quick workaround. In the long run the plugin will need to be adapted. - The -u option now also accepts a numerical user id (suggested by Derek Kelly). - The SVDRP port now accepts multiple concurrent connections. You can now keep an SVDRP connection open as long as you wish, without preventing others from connecting. Note, though, that SVDRP connections still get closed automatically if there has been no activity for 300 seconds (configurable via "Setup/Miscellaneous/SVDRP timeout (s)"). - The SVDRP log messages have been unified and now always contain the IP and port number of the remote host. - SVDRP connections are now handled in a separate "SVDRP server handler" thread, which makes them more responsive. Note that there is only one thread that handles all concurrent SVDRP connections. That way each SVDRP command is guaranteed to be processed separately, without interfering with any other SVDRP commands that might be issued at the same time. Plugins that implement SVDRP commands may need to take care of proper locking if the commands access global data. - VDR now sends out a broadcast to port 6419/udp, which was assigned to 'svdrp-disc' by the IANA. VDRs listening on that port will automatically initiate an SVDRP connection to the broadcasting VDR, and in turn send out a broadcast to make other VDRs connect to them. That way all VDRs within the local network will have permanent "peer-to-peer" SVDRP connections between each other. The configuration in the svdrphosts.conf file is taken into account when considering whether or not to respond to an SVDRP discover broadcast. - The new SVDRP command PING is used by automatically established peer-to-peer connections to keep them alive. - The new function GetSVDRPServerNames() can be used to get a list of all VDRs this VDR is connected to via SVDRP. - The new function ExecSVDRPCommand() can be used to execute an SVDRP command on one of the servers this VDR is connected to, and retrieve the result. The helper functions SVDRPCode() and SVDRPValue() can be used to easily access the codes and values returned by ExecSVDRPCommand(). - The cTimer class now has a new member named 'remote', which holds the name of the remote server this timer will record on. If this is NULL, it is a local timer. - Timers from other VDRs that are connected to this VDR via SVDRP are now automatically fetched and stored in the global Timers list. In order for this to work, all of the channels used by timers on the remote VDR must also be defined on the local VDR (however, not necessarily in the same sequence). Automatic channel syncing will be implemented later. - The main menu of the LCARS skin now displays a small rectangle on the left side of a timer if this is a remote timer. The color of that rectangle changes if the timer is currently recording on the remote VDR. - Accessing the global Timers list now has to be protected by proper locking, because SVDRP commands are now executed in a separate thread. The introduction of this locking mechanism required the following changes: + The new classes cStateLock and cStateKey are used to implement locking with quick detection of state changes. + cConfig::cConfig() now has a parameter that indicates whether this list requires locking. + The global lists of Timers, Channels, Schedules and Recordings are no longer static variables. They are now pointers that need to be retrieved through a call to cTimers::GetTimersRead/Write(), cChannels::GetChannelsRead/Write(), cSchedules::GetSchedulesRead/Write() and cRecordings::GetRecordingsRead/Write(), respectively. + References from/to link channels are now removed in cChannels::Del() rather than cChannel::~cChannel(), to make sure the caller holds a proper lock. + cChannel::HasTimer() has been removed. This information is now retrieved via cSchedule::HasTimer(). + Several member functions of cChannel, cTimer, cMarks and cRecording have been made 'const', and some of them are now available as both 'const' and 'non-const' versions. + The cChannel::Set...() functions are now 'bool' and return true if they have actually changed any of the channels's members. + cChannels::SetModified() has been renamed to cChannels::SetModifiedByUser(). + cChannels::Modified() has been renamed to cChannels::ModifiedByUser(), and now has a 'State' parameter that allows the caller to see whether a channel has been modified since the last call to this function with the same State variable. + The macros CHANNELSMOD_NONE/_AUTO/_USER have been removed. + cMarks now requires locking via cStateKey. + cSortedTimers now requires a pointer to the list of timers. + cEvent::HasTimer() no longer scans the list of timers to check whether an event is referenced by a timer, but rather keeps score of how many timers reference it. This was necessary in order to avoid having to lock the list of timers from within a cEvent. + The new class cListGarbageCollector is used to temporary store any objects deleted from cLists that require locking. This allows pointers to such objects to be dereferenced even if the objects are no longer part of the list. + cListBase::Contains() can be used to check whether a particular object is still contained in that list. + Outdated events are no longer "phased out", but rather deleted right away and thus taken care of by the new "garbage collector" of the list. + Deleted cRecording objects are no longer kept in a list of "vanished" recordings, but are rather taken care of by the new "garbage collector" of the list. + cSchedules::ClearAll() has been removed. The functionality is now implemented directly in cSVDRPServer::CmdCLRE(). + tEventID has been changed to u_int16_t in order to make room for the new member numTimers in cEvent. + cSchedule now has a member Modified(), which can be used with a State variable to quickly determine whether this schedule has been modified since the last call to this function with the same State variable. + cSchedulesLock has been removed. Locking the list of schedules is now done via the cList's new locking mechanism. + The 'OnlyRunningStatus' parameters in cEpgHandler::BeginSegmentTransfer() and cEpgHandler::EndSegmentTransfer() are now obsolete. They are still present in the interface for backward compatibility, but may be removed in a future version. Their value is always 'false'. + The constant tcMod is no longer used in cStatus::TimerChange(). The definition is still there for backward compatibility. Plugins that access the global lists of Timers, Channels, Recordings or Schedules will need to be adapted as follows: + Instead of directly accessing the global variables Timers, Channels or Recordings, they need to set up a cStateKey variable and call the proper getter function, as in cStateKey StateKey; if (const cTimers *Timers = cTimers::GetTimersRead(StateKey)) { // access the timers StateKey.Remove(); } and cStateKey StateKey; if (cTimers *Timers = cTimers::GetTimersWrite(StateKey)) { // access the timers StateKey.Remove(); } See timers.h, thread.h and tools.h for details on this new locking mechanism. + There are convenience macros for easily accessing these lists without having to explicitly set up a cStateKey and calling its Remove() function. These macros have the form LOCK_*_READ/WRITE (with '*' being TIMERS, CHANNELS, SCHEDULES or RECORDINGS). Simply put such a macro before the point where you need to access the respective list, and there will be a pointer named Timers, Channels, Schedules or Recordings, respectively, which is valid until the end of the current block. + If a plugin needs to access several of the global lists in parallel, locking must always be done in the sequence Timers, Channels, Recordings, Schedules. This is necessary to make sure that different threads that need to lock several lists at the same time don't end up in a deadlock. + Some pointer variables may need to be made 'const'. The compiler will tell you about these. - cSectionSyncer has been improved to better handle missed sections. - Added a missing initialization of 'seen' in cChannel's copy constructor. - Background modifications of channels, timers and events are now displayed immediately in the corresponding menus. - cEIT now checks the version of the tables before doing any processing, which saves a lot of locking and processing. - If a timer is newly created with the Red button in the Schedule menu, and the timer is presented to the user in the "Edit timer" menu because it will start immediately, it now *must* be confirmed with "Ok" to set the timer. Otherwise the timer will not be created. - Recordings and deleted recordings are now scanned in a single thread. - The new SVDRP command POLL is used by automatically established peer-to-peer connections to trigger fetching remote timers. - You can now set DumpSVDRPDataTransfer in svdrp.c to true to have all SVDRP communication printed to the console for debugging. - Added a missing 'const' to cReceiver::Receive(), to protect the given Data from being modified. - The SVDRP commands that deal with timers (DELT, LSTT, MODT, NEWT, NEXT and UPDT) as well as any log messages that refer to timers, now use a unique id for each timer, which remains valid as long as this instance of VDR is running. This means that timers are no longer continuously numbered from 1 to N in LSTT. There may be gaps in the sequence, in case timers have been deleted. - The Timers menu now displays the name of the remote VDR in front of the timer's file name, if this is a remote timer. - The new options "Setup/Miscellaneous/SVDRP peering", ".../SVDRP host name" and ".../SVDRP default host" can be used to configure automatic peering between VDRs in the same network. Peering is disabled by default and can be enabled by setting "SVDRP peering" to "yes". - The function cTimer::ToText() no longer returns a newline character at the end of the string. The newline is now added by the caller as necessary. This was changed because cTimer::ToText() is now also needed in a context where the terminating newline can't be used. Consequently, cChannel::ToText() and cMark::ToText() have been modified accordingly. - All timer related response strings from SVDRP commands now use the channel ID instead of channel numbers. - The "Edit timer" menu now has a new parameter "Record on", which can be used to select the VDR on which this timer shall record. Timers can be freely moved between connected VDRs by simply selecting the desired machine in this field. - The SVDRP command DELT no longer checks whether the timer that shall be deleted is currently recording. - The character 0x0D is now stripped from EPG texts (reported by Janne Pänkälä). - The EPG scanner no longer moves the dish if there is a positioner. - The 'newplugin' script now creates the 'po' subdirectory for translations (thanks to Thomas Reufer). - Skins can now implement cSkinDisplayMenu::MenuOrientation() to display horizontal menus (thanks to Stefan Braun). - Fixed a possible stack overflow in cListBase::Sort() (thanks to Oliver Endriss). - Changed the description of the --chartab option in the INSTALL file to refer to "DVB SI table strings" instead of "EPG data". - The width and height of the OSD are now limited to the actual maximum dimensions of the output device, taking into account the top and left offset. - The new setup option "Recording/Record key handling" can be used to define what happens if the Record key on the remote control is pressed during live tv (suggested by Dietmar Spingler). - Empty adaptation field TS packets are now skipped when recording (thanks to Christopher Reimer, based on the "AFFcleaner" by Stefan Pöschel).
763 lines
24 KiB
C
763 lines
24 KiB
C
/*
|
|
* cutter.c: The video cutting facilities
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: cutter.c 4.2 2015/08/09 12:24:28 kls Exp $
|
|
*/
|
|
|
|
#include "cutter.h"
|
|
#include "menu.h"
|
|
#include "recording.h"
|
|
#include "remux.h"
|
|
#include "videodir.h"
|
|
|
|
// --- cPacketBuffer ---------------------------------------------------------
|
|
|
|
class cPacketBuffer {
|
|
private:
|
|
uchar *data;
|
|
int size;
|
|
int length;
|
|
public:
|
|
cPacketBuffer(void);
|
|
~cPacketBuffer();
|
|
void Append(uchar *Data, int Length);
|
|
///< Appends Length bytes of Data to this packet buffer.
|
|
void Flush(uchar *Data, int &Length, int MaxLength);
|
|
///< Flushes the content of this packet buffer into the given Data, starting
|
|
///< at position Length, and clears the buffer afterwards. Length will be
|
|
///< incremented accordingly. If Length plus the total length of the stored
|
|
///< packets would exceed MaxLength, nothing is copied.
|
|
};
|
|
|
|
cPacketBuffer::cPacketBuffer(void)
|
|
{
|
|
data = NULL;
|
|
size = length = 0;
|
|
}
|
|
|
|
cPacketBuffer::~cPacketBuffer()
|
|
{
|
|
free(data);
|
|
}
|
|
|
|
void cPacketBuffer::Append(uchar *Data, int Length)
|
|
{
|
|
if (length + Length >= size) {
|
|
int NewSize = (length + Length) * 3 / 2;
|
|
if (uchar *p = (uchar *)realloc(data, NewSize)) {
|
|
data = p;
|
|
size = NewSize;
|
|
}
|
|
else
|
|
return; // out of memory
|
|
}
|
|
memcpy(data + length, Data, Length);
|
|
length += Length;
|
|
}
|
|
|
|
void cPacketBuffer::Flush(uchar *Data, int &Length, int MaxLength)
|
|
{
|
|
if (Data && length > 0 && Length + length <= MaxLength) {
|
|
memcpy(Data + Length, data, length);
|
|
Length += length;
|
|
}
|
|
length = 0;
|
|
}
|
|
|
|
// --- cPacketStorage --------------------------------------------------------
|
|
|
|
class cPacketStorage {
|
|
private:
|
|
cPacketBuffer *buffers[MAXPID];
|
|
public:
|
|
cPacketStorage(void);
|
|
~cPacketStorage();
|
|
void Append(int Pid, uchar *Data, int Length);
|
|
void Flush(int Pid, uchar *Data, int &Length, int MaxLength);
|
|
};
|
|
|
|
cPacketStorage::cPacketStorage(void)
|
|
{
|
|
for (int i = 0; i < MAXPID; i++)
|
|
buffers[i] = NULL;
|
|
}
|
|
|
|
cPacketStorage::~cPacketStorage()
|
|
{
|
|
for (int i = 0; i < MAXPID; i++)
|
|
delete buffers[i];
|
|
}
|
|
|
|
void cPacketStorage::Append(int Pid, uchar *Data, int Length)
|
|
{
|
|
if (!buffers[Pid])
|
|
buffers[Pid] = new cPacketBuffer;
|
|
buffers[Pid]->Append(Data, Length);
|
|
}
|
|
|
|
void cPacketStorage::Flush(int Pid, uchar *Data, int &Length, int MaxLength)
|
|
{
|
|
if (buffers[Pid])
|
|
buffers[Pid]->Flush(Data, Length, MaxLength);
|
|
}
|
|
|
|
// --- cMpeg2Fixer -----------------------------------------------------------
|
|
|
|
class cMpeg2Fixer : private cTsPayload {
|
|
private:
|
|
bool FindHeader(uint32_t Code, const char *Header);
|
|
public:
|
|
cMpeg2Fixer(uchar *Data, int Length, int Vpid);
|
|
void SetBrokenLink(void);
|
|
void SetClosedGop(void);
|
|
int GetTref(void);
|
|
void AdjGopTime(int Offset, int FramesPerSecond);
|
|
void AdjTref(int TrefOffset);
|
|
};
|
|
|
|
cMpeg2Fixer::cMpeg2Fixer(uchar *Data, int Length, int Vpid)
|
|
{
|
|
// Go to first video packet:
|
|
for (; Length > 0; Data += TS_SIZE, Length -= TS_SIZE) {
|
|
if (TsPid(Data) == Vpid) {
|
|
Setup(Data, Length, Vpid);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool cMpeg2Fixer::FindHeader(uint32_t Code, const char *Header)
|
|
{
|
|
Reset();
|
|
if (Find(Code))
|
|
return true;
|
|
esyslog("ERROR: %s header not found!", Header);
|
|
return false;
|
|
}
|
|
|
|
void cMpeg2Fixer::SetBrokenLink(void)
|
|
{
|
|
if (!FindHeader(0x000001B8, "GOP"))
|
|
return;
|
|
SkipBytes(3);
|
|
uchar b = GetByte();
|
|
if (!(b & 0x40)) { // GOP not closed
|
|
b |= 0x20;
|
|
SetByte(b, GetLastIndex());
|
|
}
|
|
}
|
|
|
|
void cMpeg2Fixer::SetClosedGop(void)
|
|
{
|
|
if (!FindHeader(0x000001B8, "GOP"))
|
|
return;
|
|
SkipBytes(3);
|
|
uchar b = GetByte();
|
|
b |= 0x40;
|
|
SetByte(b, GetLastIndex());
|
|
}
|
|
|
|
int cMpeg2Fixer::GetTref(void)
|
|
{
|
|
if (!FindHeader(0x00000100, "picture"))
|
|
return 0;
|
|
int Tref = GetByte() << 2;
|
|
Tref |= GetByte() >> 6;
|
|
return Tref;
|
|
}
|
|
|
|
void cMpeg2Fixer::AdjGopTime(int Offset, int FramesPerSecond)
|
|
{
|
|
if (!FindHeader(0x000001B8, "GOP"))
|
|
return;
|
|
uchar Byte1 = GetByte();
|
|
int Index1 = GetLastIndex();
|
|
uchar Byte2 = GetByte();
|
|
int Index2 = GetLastIndex();
|
|
uchar Byte3 = GetByte();
|
|
int Index3 = GetLastIndex();
|
|
uchar Byte4 = GetByte();
|
|
int Index4 = GetLastIndex();
|
|
uchar Frame = ((Byte3 & 0x1F) << 1) | (Byte4 >> 7);
|
|
uchar Sec = ((Byte2 & 0x07) << 3) | (Byte3 >> 5);
|
|
uchar Min = ((Byte1 & 0x03) << 4) | (Byte2 >> 4);
|
|
uchar Hour = ((Byte1 & 0x7C) >> 2);
|
|
int GopTime = ((Hour * 60 + Min) * 60 + Sec) * FramesPerSecond + Frame;
|
|
if (GopTime) { // do not fix when zero
|
|
GopTime += Offset;
|
|
if (GopTime < 0)
|
|
GopTime += 24 * 60 * 60 * FramesPerSecond;
|
|
Frame = GopTime % FramesPerSecond;
|
|
GopTime = GopTime / FramesPerSecond;
|
|
Sec = GopTime % 60;
|
|
GopTime = GopTime / 60;
|
|
Min = GopTime % 60;
|
|
GopTime = GopTime / 60;
|
|
Hour = GopTime % 24;
|
|
SetByte((Byte1 & 0x80) | (Hour << 2) | (Min >> 4), Index1);
|
|
SetByte(((Min & 0x0F) << 4) | 0x08 | (Sec >> 3), Index2);
|
|
SetByte(((Sec & 0x07) << 3) | (Frame >> 1), Index3);
|
|
SetByte((Byte4 & 0x7F) | ((Frame & 0x01) << 7), Index4);
|
|
}
|
|
}
|
|
|
|
void cMpeg2Fixer::AdjTref(int TrefOffset)
|
|
{
|
|
if (!FindHeader(0x00000100, "picture"))
|
|
return;
|
|
int Tref = GetByte() << 2;
|
|
int Index1 = GetLastIndex();
|
|
uchar Byte2 = GetByte();
|
|
int Index2 = GetLastIndex();
|
|
Tref |= Byte2 >> 6;
|
|
Tref -= TrefOffset;
|
|
SetByte(Tref >> 2, Index1);
|
|
SetByte((Tref << 6) | (Byte2 & 0x3F), Index2);
|
|
}
|
|
|
|
// --- cCuttingThread --------------------------------------------------------
|
|
|
|
class cCuttingThread : public cThread {
|
|
private:
|
|
const char *error;
|
|
bool isPesRecording;
|
|
double framesPerSecond;
|
|
cUnbufferedFile *fromFile, *toFile;
|
|
cFileName *fromFileName, *toFileName;
|
|
cIndexFile *fromIndex, *toIndex;
|
|
cMarks fromMarks, toMarks;
|
|
int numSequences;
|
|
off_t maxVideoFileSize;
|
|
off_t fileSize;
|
|
bool suspensionLogged;
|
|
int sequence; // cutting sequence
|
|
int delta; // time between two frames (PTS ticks)
|
|
int64_t lastVidPts; // the video PTS of the last frame (in display order)
|
|
bool multiFramePkt; // multiple frames within one PES packet
|
|
int64_t firstPts; // first valid PTS, for dangling packet stripping
|
|
int64_t offset; // offset to add to all timestamps
|
|
int tRefOffset; // number of stripped frames in GOP
|
|
uchar counter[MAXPID]; // the TS continuity counter for each PID
|
|
bool keepPkt[MAXPID]; // flag for each PID to keep packets, for dangling packet stripping
|
|
int numIFrames; // number of I-frames without pending packets
|
|
cPatPmtParser patPmtParser;
|
|
bool Throttled(void);
|
|
bool SwitchFile(bool Force = false);
|
|
bool LoadFrame(int Index, uchar *Buffer, bool &Independent, int &Length);
|
|
bool FramesAreEqual(int Index1, int Index2);
|
|
void GetPendingPackets(uchar *Buffer, int &Length, int Index);
|
|
// Gather all non-video TS packets from Index upward that either belong to
|
|
// payloads that started before Index, or have a PTS that is before lastVidPts,
|
|
// and add them to the end of the given Data.
|
|
bool FixFrame(uchar *Data, int &Length, bool Independent, int Index, bool CutIn, bool CutOut);
|
|
bool ProcessSequence(int LastEndIndex, int BeginIndex, int EndIndex, int NextBeginIndex);
|
|
protected:
|
|
virtual void Action(void);
|
|
public:
|
|
cCuttingThread(const char *FromFileName, const char *ToFileName);
|
|
virtual ~cCuttingThread();
|
|
const char *Error(void) { return error; }
|
|
};
|
|
|
|
cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
|
|
:cThread("video cutting", true)
|
|
{
|
|
error = NULL;
|
|
fromFile = toFile = NULL;
|
|
fromFileName = toFileName = NULL;
|
|
fromIndex = toIndex = NULL;
|
|
cRecording Recording(FromFileName);
|
|
isPesRecording = Recording.IsPesRecording();
|
|
framesPerSecond = Recording.FramesPerSecond();
|
|
suspensionLogged = false;
|
|
fileSize = 0;
|
|
sequence = 0;
|
|
delta = int(round(PTSTICKS / framesPerSecond));
|
|
lastVidPts = -1;
|
|
multiFramePkt = false;
|
|
firstPts = -1;
|
|
offset = 0;
|
|
tRefOffset = 0;
|
|
memset(counter, 0x00, sizeof(counter));
|
|
numIFrames = 0;
|
|
if (fromMarks.Load(FromFileName, framesPerSecond, isPesRecording) && fromMarks.Count()) {
|
|
numSequences = fromMarks.GetNumSequences();
|
|
if (numSequences > 0) {
|
|
fromFileName = new cFileName(FromFileName, false, true, isPesRecording);
|
|
toFileName = new cFileName(ToFileName, true, true, isPesRecording);
|
|
fromIndex = new cIndexFile(FromFileName, false, isPesRecording);
|
|
toIndex = new cIndexFile(ToFileName, true, isPesRecording);
|
|
toMarks.Load(ToFileName, framesPerSecond, isPesRecording); // doesn't actually load marks, just sets the file name
|
|
maxVideoFileSize = MEGABYTE(Setup.MaxVideoFileSize);
|
|
if (isPesRecording && maxVideoFileSize > MEGABYTE(MAXVIDEOFILESIZEPES))
|
|
maxVideoFileSize = MEGABYTE(MAXVIDEOFILESIZEPES);
|
|
Start();
|
|
}
|
|
else
|
|
esyslog("no editing sequences found for %s", FromFileName);
|
|
}
|
|
else
|
|
esyslog("no editing marks found for %s", FromFileName);
|
|
}
|
|
|
|
cCuttingThread::~cCuttingThread()
|
|
{
|
|
Cancel(3);
|
|
delete fromFileName;
|
|
delete toFileName;
|
|
delete fromIndex;
|
|
delete toIndex;
|
|
}
|
|
|
|
bool cCuttingThread::Throttled(void)
|
|
{
|
|
if (cIoThrottle::Engaged()) {
|
|
if (!suspensionLogged) {
|
|
dsyslog("suspending cutter thread");
|
|
suspensionLogged = true;
|
|
}
|
|
return true;
|
|
}
|
|
else if (suspensionLogged) {
|
|
dsyslog("resuming cutter thread");
|
|
suspensionLogged = false;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool cCuttingThread::LoadFrame(int Index, uchar *Buffer, bool &Independent, int &Length)
|
|
{
|
|
uint16_t FileNumber;
|
|
off_t FileOffset;
|
|
if (fromIndex->Get(Index, &FileNumber, &FileOffset, &Independent, &Length)) {
|
|
fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
|
|
if (fromFile) {
|
|
fromFile->SetReadAhead(MEGABYTE(20));
|
|
int len = ReadFrame(fromFile, Buffer, Length, MAXFRAMESIZE);
|
|
if (len < 0)
|
|
error = "ReadFrame";
|
|
else if (len != Length)
|
|
Length = len;
|
|
return error == NULL;
|
|
}
|
|
else
|
|
error = "fromFile";
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool cCuttingThread::SwitchFile(bool Force)
|
|
{
|
|
if (fileSize > maxVideoFileSize || Force) {
|
|
toFile = toFileName->NextFile();
|
|
if (!toFile) {
|
|
error = "toFile";
|
|
return false;
|
|
}
|
|
fileSize = 0;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
class cHeapBuffer {
|
|
private:
|
|
uchar *buffer;
|
|
public:
|
|
cHeapBuffer(int Size) { buffer = MALLOC(uchar, Size); }
|
|
~cHeapBuffer() { free(buffer); }
|
|
operator uchar * () { return buffer; }
|
|
};
|
|
|
|
bool cCuttingThread::FramesAreEqual(int Index1, int Index2)
|
|
{
|
|
cHeapBuffer Buffer1(MAXFRAMESIZE);
|
|
cHeapBuffer Buffer2(MAXFRAMESIZE);
|
|
if (!Buffer1 || !Buffer2)
|
|
return false;
|
|
bool Independent;
|
|
int Length1;
|
|
int Length2;
|
|
if (LoadFrame(Index1, Buffer1, Independent, Length1) && LoadFrame(Index2, Buffer2, Independent, Length2)) {
|
|
if (Length1 == Length2) {
|
|
int Diffs = 0;
|
|
for (int i = 0; i < Length1; i++) {
|
|
if (Buffer1[i] != Buffer2[i]) {
|
|
if (Diffs++ > 10) // the continuity counters of the PAT/PMT packets may differ
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void cCuttingThread::GetPendingPackets(uchar *Data, int &Length, int Index)
|
|
{
|
|
cHeapBuffer Buffer(MAXFRAMESIZE);
|
|
if (!Buffer)
|
|
return;
|
|
bool Processed[MAXPID] = { false };
|
|
cPacketStorage PacketStorage;
|
|
int64_t LastPts = lastVidPts + delta;// adding one frame length to fully cover the very last frame
|
|
Processed[patPmtParser.Vpid()] = true; // we only want non-video packets
|
|
for (int NumIndependentFrames = 0; NumIndependentFrames < 2; Index++) {
|
|
bool Independent;
|
|
int len;
|
|
if (LoadFrame(Index, Buffer, Independent, len)) {
|
|
if (Independent)
|
|
NumIndependentFrames++;
|
|
for (uchar *p = Buffer; len >= TS_SIZE && *p == TS_SYNC_BYTE; len -= TS_SIZE, p += TS_SIZE) {
|
|
int Pid = TsPid(p);
|
|
if (Pid != PATPID && !patPmtParser.IsPmtPid(Pid) && !Processed[Pid]) {
|
|
int64_t Pts = TsGetPts(p, TS_SIZE);
|
|
if (Pts >= 0) {
|
|
int64_t d = PtsDiff(LastPts, Pts);
|
|
if (d < 0) // Pts is before LastPts
|
|
PacketStorage.Flush(Pid, Data, Length, MAXFRAMESIZE);
|
|
else { // Pts is at or after LastPts
|
|
NumIndependentFrames = 0; // we search until we find two consecutive I-frames without any more pending packets
|
|
Processed[Pid] = true;
|
|
}
|
|
}
|
|
if (!Processed[Pid])
|
|
PacketStorage.Append(Pid, p, TS_SIZE);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
|
|
bool cCuttingThread::FixFrame(uchar *Data, int &Length, bool Independent, int Index, bool CutIn, bool CutOut)
|
|
{
|
|
if (!patPmtParser.Vpid()) {
|
|
if (!patPmtParser.ParsePatPmt(Data, Length))
|
|
return false;
|
|
}
|
|
if (CutIn) {
|
|
sequence++;
|
|
memset(keepPkt, false, sizeof(keepPkt));
|
|
numIFrames = 0;
|
|
firstPts = TsGetPts(Data, Length);
|
|
// Determine the PTS offset at the beginning of each sequence (except the first one):
|
|
if (sequence != 1) {
|
|
if (firstPts >= 0)
|
|
offset = (lastVidPts + delta - firstPts) & MAX33BIT;
|
|
}
|
|
}
|
|
if (CutOut)
|
|
GetPendingPackets(Data, Length, Index + 1);
|
|
if (Independent) {
|
|
numIFrames++;
|
|
tRefOffset = 0;
|
|
}
|
|
// Fix MPEG-2:
|
|
if (patPmtParser.Vtype() == 2) {
|
|
cMpeg2Fixer Mpeg2fixer(Data, Length, patPmtParser.Vpid());
|
|
if (CutIn) {
|
|
if (sequence == 1 || multiFramePkt)
|
|
Mpeg2fixer.SetBrokenLink();
|
|
else {
|
|
Mpeg2fixer.SetClosedGop();
|
|
tRefOffset = Mpeg2fixer.GetTref();
|
|
}
|
|
}
|
|
if (tRefOffset)
|
|
Mpeg2fixer.AdjTref(tRefOffset);
|
|
if (sequence > 1 && Independent)
|
|
Mpeg2fixer.AdjGopTime((offset - MAX33BIT) / delta, round(framesPerSecond));
|
|
}
|
|
bool DeletedFrame = false;
|
|
bool GotVidPts = false;
|
|
bool StripVideo = sequence > 1 && tRefOffset;
|
|
uchar *p;
|
|
int len;
|
|
for (p = Data, len = Length; len >= TS_SIZE && *p == TS_SYNC_BYTE; p += TS_SIZE, len -= TS_SIZE) {
|
|
int Pid = TsPid(p);
|
|
// Strip dangling packets:
|
|
if (numIFrames < 2 && Pid != PATPID && !patPmtParser.IsPmtPid(Pid)) {
|
|
if (Pid != patPmtParser.Vpid() || StripVideo) {
|
|
int64_t Pts = TsGetPts(p, TS_SIZE);
|
|
if (Pts >= 0)
|
|
keepPkt[Pid] = PtsDiff(firstPts, Pts) >= 0; // Pts is at or after FirstPts
|
|
if (!keepPkt[Pid]) {
|
|
TsHidePayload(p);
|
|
numIFrames = 0; // we search until we find two consecutive I-frames without any more dangling packets
|
|
if (Pid == patPmtParser.Vpid())
|
|
DeletedFrame = true;
|
|
}
|
|
}
|
|
}
|
|
// Adjust the TS continuity counter:
|
|
if (sequence > 1) {
|
|
if (TsHasPayload(p))
|
|
counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
|
|
TsSetContinuityCounter(p, counter[Pid]);
|
|
}
|
|
else
|
|
counter[Pid] = TsGetContinuityCounter(p); // collect initial counters
|
|
// Adjust PTS:
|
|
int64_t Pts = TsGetPts(p, TS_SIZE);
|
|
if (Pts >= 0) {
|
|
if (sequence > 1) {
|
|
Pts = PtsAdd(Pts, offset);
|
|
TsSetPts(p, TS_SIZE, Pts);
|
|
}
|
|
// Keep track of the highest video PTS - in case of multiple fields per frame, take the first one
|
|
if (!GotVidPts && Pid == patPmtParser.Vpid()) {
|
|
GotVidPts = true;
|
|
if (lastVidPts < 0 || PtsDiff(lastVidPts, Pts) > 0)
|
|
lastVidPts = Pts;
|
|
}
|
|
}
|
|
// Adjust DTS:
|
|
if (sequence > 1) {
|
|
int64_t Dts = TsGetDts(p, TS_SIZE);
|
|
if (Dts >= 0) {
|
|
Dts = PtsAdd(Dts, offset);
|
|
if (CutIn)
|
|
Dts = PtsAdd(Dts, tRefOffset * delta);
|
|
TsSetDts(p, TS_SIZE, Dts);
|
|
}
|
|
int64_t Pcr = TsGetPcr(p);
|
|
if (Pcr >= 0) {
|
|
Pcr = Pcr + offset * PCRFACTOR;
|
|
if (Pcr > MAX27MHZ)
|
|
Pcr -= MAX27MHZ + 1;
|
|
TsSetPcr(p, Pcr);
|
|
}
|
|
}
|
|
}
|
|
if (!DeletedFrame && !GotVidPts) {
|
|
// Adjust PTS for multiple frames within a single PES packet:
|
|
lastVidPts = (lastVidPts + delta) & MAX33BIT;
|
|
multiFramePkt = true;
|
|
}
|
|
return DeletedFrame;
|
|
}
|
|
|
|
bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIndex, int NextBeginIndex)
|
|
{
|
|
// Check for seamless connections:
|
|
bool SeamlessBegin = LastEndIndex >= 0 && FramesAreEqual(LastEndIndex, BeginIndex);
|
|
bool SeamlessEnd = NextBeginIndex >= 0 && FramesAreEqual(EndIndex, NextBeginIndex);
|
|
// Process all frames from BeginIndex (included) to EndIndex (excluded):
|
|
cHeapBuffer Buffer(MAXFRAMESIZE);
|
|
if (!Buffer) {
|
|
error = "malloc";
|
|
return false;
|
|
}
|
|
for (int Index = BeginIndex; Running() && Index < EndIndex; Index++) {
|
|
bool Independent;
|
|
int Length;
|
|
if (LoadFrame(Index, Buffer, Independent, Length)) {
|
|
// Make sure there is enough disk space:
|
|
AssertFreeDiskSpace(-1);
|
|
bool CutIn = !SeamlessBegin && Index == BeginIndex;
|
|
bool CutOut = !SeamlessEnd && Index == EndIndex - 1;
|
|
bool DeletedFrame = false;
|
|
if (!isPesRecording) {
|
|
DeletedFrame = FixFrame(Buffer, Length, Independent, Index, CutIn, CutOut);
|
|
}
|
|
else if (CutIn)
|
|
cRemux::SetBrokenLink(Buffer, Length);
|
|
// Every file shall start with an independent frame:
|
|
if (Independent) {
|
|
if (!SwitchFile())
|
|
return false;
|
|
}
|
|
// Write index:
|
|
if (!DeletedFrame && !toIndex->Write(Independent, toFileName->Number(), fileSize)) {
|
|
error = "toIndex";
|
|
return false;
|
|
}
|
|
// Write data:
|
|
if (toFile->Write(Buffer, Length) < 0) {
|
|
error = "safe_write";
|
|
return false;
|
|
}
|
|
fileSize += Length;
|
|
// Generate marks at the editing points in the edited recording:
|
|
if (numSequences > 1 && Index == BeginIndex) {
|
|
if (toMarks.Count() > 0)
|
|
toMarks.Add(toIndex->Last());
|
|
toMarks.Add(toIndex->Last());
|
|
toMarks.Save();
|
|
}
|
|
}
|
|
else
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void cCuttingThread::Action(void)
|
|
{
|
|
if (cMark *BeginMark = fromMarks.GetNextBegin()) {
|
|
fromFile = fromFileName->Open();
|
|
toFile = toFileName->Open();
|
|
if (!fromFile || !toFile)
|
|
return;
|
|
int LastEndIndex = -1;
|
|
while (BeginMark && Running()) {
|
|
// Suspend cutting if we have severe throughput problems:
|
|
if (Throttled()) {
|
|
cCondWait::SleepMs(100);
|
|
continue;
|
|
}
|
|
// Determine the actual begin and end marks, skipping any marks at the same position:
|
|
cMark *EndMark = fromMarks.GetNextEnd(BeginMark);
|
|
// Process the current sequence:
|
|
int EndIndex = EndMark ? EndMark->Position() : fromIndex->Last() + 1;
|
|
int NextBeginIndex = -1;
|
|
if (EndMark) {
|
|
if (cMark *NextBeginMark = fromMarks.GetNextBegin(EndMark))
|
|
NextBeginIndex = NextBeginMark->Position();
|
|
}
|
|
if (!ProcessSequence(LastEndIndex, BeginMark->Position(), EndIndex, NextBeginIndex))
|
|
break;
|
|
if (!EndMark)
|
|
break; // reached EOF
|
|
LastEndIndex = EndIndex;
|
|
// Switch to the next sequence:
|
|
BeginMark = fromMarks.GetNextBegin(EndMark);
|
|
if (BeginMark) {
|
|
// Split edited files:
|
|
if (Setup.SplitEditedFiles) {
|
|
if (!SwitchFile(true))
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
esyslog("no editing marks found!");
|
|
}
|
|
|
|
// --- cCutter ---------------------------------------------------------------
|
|
|
|
cCutter::cCutter(const char *FileName)
|
|
{
|
|
cuttingThread = NULL;
|
|
error = false;
|
|
originalVersionName = FileName;
|
|
}
|
|
|
|
cCutter::~cCutter()
|
|
{
|
|
Stop();
|
|
}
|
|
|
|
cString cCutter::EditedFileName(const char *FileName)
|
|
{
|
|
cRecording Recording(FileName);
|
|
cMarks Marks;
|
|
if (Marks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording())) {
|
|
if (cMark *First = Marks.GetNextBegin())
|
|
Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60);
|
|
return Recording.PrefixFileName('%');
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
bool cCutter::Start(void)
|
|
{
|
|
if (!cuttingThread) {
|
|
error = false;
|
|
if (*originalVersionName) {
|
|
cRecording Recording(originalVersionName);
|
|
editedVersionName = EditedFileName(originalVersionName);
|
|
if (*editedVersionName) {
|
|
if (strcmp(originalVersionName, editedVersionName) != 0) { // names must be different!
|
|
cRecordingUserCommand::InvokeCommand(RUC_EDITINGRECORDING, editedVersionName, originalVersionName);
|
|
if (cVideoDirectory::RemoveVideoFile(editedVersionName) && MakeDirs(editedVersionName, true)) {
|
|
Recording.WriteInfo(editedVersionName);
|
|
LOCK_RECORDINGS_WRITE;
|
|
Recordings->AddByName(editedVersionName, false);
|
|
cuttingThread = new cCuttingThread(originalVersionName, editedVersionName);
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void cCutter::Stop(void)
|
|
{
|
|
bool Interrupted = cuttingThread && cuttingThread->Active();
|
|
const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
|
|
delete cuttingThread;
|
|
cuttingThread = NULL;
|
|
if ((Interrupted || Error) && *editedVersionName) {
|
|
if (Interrupted)
|
|
isyslog("editing process has been interrupted");
|
|
if (Error)
|
|
esyslog("ERROR: '%s' during editing process", Error);
|
|
if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), editedVersionName) == 0)
|
|
cControl::Shutdown();
|
|
cVideoDirectory::RemoveVideoFile(editedVersionName);
|
|
LOCK_RECORDINGS_WRITE;
|
|
Recordings->DelByName(editedVersionName);
|
|
}
|
|
}
|
|
|
|
bool cCutter::Active(void)
|
|
{
|
|
if (cuttingThread) {
|
|
if (cuttingThread->Active())
|
|
return true;
|
|
error = cuttingThread->Error();
|
|
Stop();
|
|
if (!error)
|
|
cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName, originalVersionName);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool cCutter::Error(void)
|
|
{
|
|
return error;
|
|
}
|
|
|
|
#define CUTTINGCHECKINTERVAL 500 // ms between checks for the active cutting process
|
|
|
|
bool CutRecording(const char *FileName)
|
|
{
|
|
if (DirectoryOk(FileName)) {
|
|
cRecording Recording(FileName);
|
|
if (Recording.Name()) {
|
|
cMarks Marks;
|
|
if (Marks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording()) && Marks.Count()) {
|
|
if (Marks.GetNumSequences()) {
|
|
cCutter Cutter(FileName);
|
|
if (Cutter.Start()) {
|
|
while (Cutter.Active())
|
|
cCondWait::SleepMs(CUTTINGCHECKINTERVAL);
|
|
if (!Cutter.Error())
|
|
return true;
|
|
fprintf(stderr, "error while cutting\n");
|
|
}
|
|
else
|
|
fprintf(stderr, "can't start editing process\n");
|
|
}
|
|
else
|
|
fprintf(stderr, "'%s' has no editing sequences\n", FileName);
|
|
}
|
|
else
|
|
fprintf(stderr, "'%s' has no editing marks\n", FileName);
|
|
}
|
|
else
|
|
fprintf(stderr, "'%s' is not a recording\n", FileName);
|
|
}
|
|
else
|
|
fprintf(stderr, "'%s' is not a directory\n", FileName);
|
|
return false;
|
|
}
|