Ticket #10872: 10872-v2.patch

mythtv/libs/libmythtv/NuppelVideoRecorder.cpp

@@ -2806 +2806 @@
     }
 }
 
-void NuppelVideoRecorder::SetNextRecording(const ProgramInfo *progInf,
-                                           RingBuffer *rb)
+void NuppelVideoRecorder::SetNextRecording(
+    const RecordingInfo *progInf, RingBuffer *rb)
 {
     // First we do some of the time consuming stuff we can do now
     SavePositionMap(true);
@@ -2819 +2819 @@
     QMutexLocker locker(&nextRingBufferLock);
     nextRecording = NULL;
     if (progInf)
-        nextRecording = new ProgramInfo(*progInf);
+        nextRecording = new RecordingInfo(*progInf);
     nextRingBuffer = rb;
 }
 

mythtv/libs/libmythtv/NuppelVideoRecorder.h

@@ -101 +101 @@
     void SetVideoFilters(QString &filters);
     void SetTranscoding(bool value) { transcoding = value; };
 
-    void SetNextRecording(const ProgramInfo*, RingBuffer*);
+    void SetNextRecording(const RecordingInfo*, RingBuffer*);
     void ResetForNewFile(void);
     void FinishRecording(void);
     void StartNewFile(void);

mythtv/libs/libmythtv/dtvrecorder.cpp

@@ -688 +688 @@
 }
 
 // documented in recorderbase.h
-void DTVRecorder::SetNextRecording(const ProgramInfo *progInf, RingBuffer *rb)
+void DTVRecorder::SetNextRecording(const RecordingInfo *progInf, RingBuffer *rb)
 {
     LOG(VB_RECORD, LOG_INFO, LOC + QString("SetNextRecord(0x%1, 0x%2)")
             .arg((uint64_t)progInf,0,16).arg((uint64_t)rb,0,16));
@@ -706 +706 @@
 
     nextRecording = NULL;
     if (progInf)
-        nextRecording = new ProgramInfo(*progInf);
+        nextRecording = new RecordingInfo(*progInf);
 
     nextRingBuffer = rb;
     nextRingBufferLock.unlock();

mythtv/libs/libmythtv/dtvrecorder.h

@@ -50 +50 @@
     void Initialize(void) {;}
     int GetVideoFd(void) { return _stream_fd; }
 
-    virtual void SetNextRecording(const ProgramInfo*, RingBuffer*);
+    virtual void SetNextRecording(const RecordingInfo*, RingBuffer*);
     virtual void SetStreamData(void);
     void SetStreamData(MPEGStreamData* sd);
     MPEGStreamData *GetStreamData(void) const { return _stream_data; }

mythtv/libs/libmythtv/recorderbase.cpp

@@ -82 +82 @@
     weMadeBuffer = false;
 }
 
-void RecorderBase::SetRecording(const ProgramInfo *pginfo)
+void RecorderBase::SetRecording(const RecordingInfo *pginfo)
 {
     if (pginfo)
         LOG(VB_RECORD, LOG_INFO, LOC + QString("SetRecording(0x%1) title(%2)")
@@ -92 +92 @@
 
     ProgramInfo *oldrec = curRecording;
     if (pginfo)
-        curRecording = new ProgramInfo(*pginfo);
+        curRecording = new RecordingInfo(*pginfo);
     else
         curRecording = NULL;
 

mythtv/libs/libmythtv/recorderbase.h

@@ -20 +20 @@
 class FireWireDBOptions;
 class GeneralDBOptions;
 class RecordingProfile;
+class RecordingInfo;
 class DVBDBOptions;
 class RecorderBase;
 class ChannelBase;
-class ProgramInfo;
 class RingBuffer;
 class TVRec;
 
@@ -63 +63 @@
      *
      *  \sa ChannelNameChanged(const QString&)
      */
-    void SetRecording(const ProgramInfo *pginfo);
+    void SetRecording(const RecordingInfo *pginfo);
 
     /** \brief Tells recorder to use an externally created ringbuffer.
      *
@@ -116 +116 @@
      *
      *   This calls TVRec::RingBufferChanged() when the switch happens.
      */
-    virtual void SetNextRecording(const ProgramInfo*, RingBuffer*) = 0;
+    virtual void SetNextRecording(const RecordingInfo*, RingBuffer*) = 0;
 
     /** \brief This is called between SetOptionsFromProfile() and
      *         run() to initialize any devices, etc.
@@ -276 +276 @@
     uint           m_videoWidth;
     double         m_frameRate;
 
-    ProgramInfo   *curRecording;
+    RecordingInfo *curRecording;
 
     // For handling pausing + stop recording
     mutable QMutex pauseLock; // also used for request_recording and recording
@@ -294 +294 @@
     // For RingBuffer switching
     QMutex         nextRingBufferLock;
     RingBuffer    *nextRingBuffer;
-    ProgramInfo   *nextRecording;
+    RecordingInfo *nextRecording;
 
     // Seektable  support
     MarkTypes      positionMapType;

mythtv/libs/libmythtv/recordinginfo.cpp

@@ -110 +110 @@
     oldrecstatus(_oldrecstatus),
     savedrecstatus(rsUnknown),
     future(_future),
+    desiredrecstartts(_recstartts),
+    desiredrecendts(_recendts),
     record(NULL)
 {
     hostname = _hostname;
@@ -203 +205 @@
     oldrecstatus(rsUnknown),
     savedrecstatus(rsUnknown),
     future(false),
+    desiredrecstartts(_recstartts),
+    desiredrecendts(_recendts),
     record(NULL)
 {
     recpriority = _recpriority;
@@ -379 +383 @@
         oldrecstatus   = other.oldrecstatus;
         savedrecstatus = other.savedrecstatus;
         future         = other.future;
+        desiredrecstartts = other.desiredrecstartts;
+        desiredrecendts = other.desiredrecendts;
     }
 }
 
@@ -403 +409 @@
     oldrecstatus   = rsUnknown;
     savedrecstatus = rsUnknown;
     future         = false;
+    desiredrecstartts = QDateTime();
+    desiredrecendts = QDateTime();
 }
 
 void RecordingInfo::clear(void)
@@ -415 +423 @@
     oldrecstatus = rsUnknown;
     savedrecstatus = rsUnknown;
     future = false;
+    desiredrecstartts = QDateTime();
+    desiredrecendts = QDateTime();
 }
 
 

mythtv/libs/libmythtv/recordinginfo.h

@@ -1 +1 @@
 #ifndef _RECORDING_INFO_H_
 #define _RECORDING_INFO_H_
 
+#include <QDateTime>
+#include <QString>
+
 #include "mythtvexp.h"
 #include "programinfo.h"
 
@@ -206 +209 @@
     void ApplyRecordRecPriorityChange(int);
     void ToggleRecord(void);
 
+    // Used in determining start and end for RecordingQuality determination
+    void SetDesiredStartTime(const QDateTime &dt) { desiredrecstartts = dt; }
+    void SetDesiredEndTime(const QDateTime &dt) { desiredrecendts = dt; }
+    QDateTime GetDesiredStartTime(void) const { return desiredrecstartts; }
+    QDateTime GetDesiredEndTime(void) const { return desiredrecendts; }
+
     // these five can be moved to programinfo
     void AddHistory(bool resched = true, bool forcedup = false, 
                     bool future = false);//pi
@@ -231 +240 @@
     RecStatusType oldrecstatus;
     RecStatusType savedrecstatus;
     bool future;
+    QDateTime desiredrecstartts;
+    QDateTime desiredrecendts;
 
   private:
     mutable class RecordingRule *record;

mythtv/libs/libmythtv/recordingquality.cpp

@@ -3 +3 @@
 
 #include "recordingquality.h"
 #include "mythcorecontext.h"
+#include "recordinginfo.h"
 #include "mythmiscutil.h"
 #include "mythlogging.h"
-#include "programinfo.h"
 
 static void merge_overlapping(RecordingGaps &gaps);
-static double score_gaps(const ProgramInfo*, const RecordingGaps&);
+static double score_gaps(const RecordingInfo&, const RecordingGaps&);
+static QDateTime get_start(const RecordingInfo&);
+static QDateTime get_end(const RecordingInfo&);
 
 RecordingQuality::RecordingQuality(
-    const ProgramInfo *pi, const RecordingGaps &rg,
+    const RecordingInfo *ri, const RecordingGaps &rg,
     const QDateTime &first, const QDateTime &latest) :
     m_continuity_error_count(0), m_packet_count(0),
     m_overall_score(1.0), m_recording_gaps(rg)
 {
-    if (!pi)
+    if (!ri)
         return;
 
-    m_program_key = pi->MakeUniqueKey();
+    m_program_key = ri->MakeUniqueKey();
 
     // trim start
-    QDateTime start = pi->GetScheduledStartTime();
+    QDateTime start = get_start(*ri);
     while (!m_recording_gaps.empty() &&
            m_recording_gaps.first().GetStart() < start)
     {
@@ -34 +36 @@
     }
 
     // trim end
-    QDateTime end = pi->GetScheduledEndTime();
+    QDateTime end = get_end(*ri);
     while (!m_recording_gaps.empty() &&
            m_recording_gaps.back().GetEnd() > end)
     {
@@ -58 +60 @@
     stable_sort(m_recording_gaps.begin(), m_recording_gaps.end());
     merge_overlapping(m_recording_gaps);
 
-    m_overall_score = score_gaps(pi, m_recording_gaps);
+    m_overall_score = score_gaps(*ri, m_recording_gaps);
 }
 
 void RecordingQuality::AddTSStatistics(
@@ -137 +139 @@
     }
 }
 
-static double score_gaps(const ProgramInfo *pi, const RecordingGaps &gaps)
+static double score_gaps(const RecordingInfo &ri, const RecordingGaps &gaps)
 {
     RecordingGaps::const_iterator it = gaps.begin();
     if (it == gaps.end())
         return 1.0;
 
-    QDateTime start = pi->GetScheduledStartTime();
+    QDateTime start = get_start(ri);
 
-    double program_length = start.secsTo(pi->GetScheduledEndTime());
+    double program_length = start.secsTo(get_end(ri));
     if (program_length < 1.0)
         return 0.0;
 
@@ -190 +192 @@
     return (score > 0.0) ? score : 0.0;
 }
 
+static QDateTime get_start(const RecordingInfo &ri)
+{
+    if (ri.GetDesiredStartTime().isValid())
+    {
+        return (ri.GetScheduledStartTime() > ri.GetDesiredStartTime()) ?
+            ri.GetScheduledStartTime() : ri.GetDesiredStartTime();
+    }
+    else
+    {
+        return ri.GetScheduledStartTime();
+    }
+}
+
+static QDateTime get_end(const RecordingInfo &ri)
+{
+    if (ri.GetDesiredEndTime().isValid())
+    {
+        return (ri.GetScheduledEndTime() < ri.GetDesiredEndTime()) ?
+            ri.GetScheduledEndTime() : ri.GetDesiredEndTime();
+    }
+    else
+    {
+        return ri.GetScheduledEndTime();
+    }
+}

mythtv/libs/libmythtv/recordingquality.h

@@ -7 +7 @@
 
 #include "mythtvexp.h"
 
-class ProgramInfo;
+class RecordingInfo;
 
 class RecordingGap
 {
@@ -33 +33 @@
 {
   public:
     RecordingQuality(
-        const ProgramInfo*, const RecordingGaps&,
+        const RecordingInfo*, const RecordingGaps&,
         const QDateTime &firstData, const QDateTime &latestData);
 
     void AddTSStatistics(int continuity_error_count, int packet_count);

mythtv/libs/libmythtv/tv_rec.cpp

@@ -4145 +4145 @@
     {
         recorder->SetRingBuffer(ringBuffer);
         ProgramInfo *progInfo = tvchain->GetProgramAt(-1);
-        recorder->SetRecording(progInfo);
+        RecordingInfo recinfo(*progInfo);
         delete progInfo;
+        recorder->SetRecording(&recinfo);
     }
     recorder->Reset();