Ticket #788: commflag-svn_start_stop_times.3.patch

programs/mythcommflag/ClassicCommDetector.cpp

@@ -43 +43 @@
                                          bool showProgress_in,
                                          bool fullSpeed_in,
                                          NuppelVideoPlayer* nvp_in,
+                                         const QDateTime& startedAt_in,
+                                         const QDateTime& stopsAt_in,
                                          const QDateTime& recordingStartedAt_in,
                                          const QDateTime& recordingStopsAt_in) :
         commDetectMethod(commDetectMethod_in),
         showProgress(showProgress_in),
         fullSpeed(fullSpeed_in),
         nvp(nvp_in),
+        startedAt(startedAt_in),
+        stopsAt(stopsAt_in),
         recordingStartedAt(recordingStartedAt_in),
         recordingStopsAt(recordingStopsAt_in),
         framesProcessed(0)
@@ -248 +252 @@
     
     int requiredHeadStart = 30;
     if (commDetectMethod & COMM_DETECT_LOGO)
-        requiredHeadStart += commDetectLogoSecondsNeeded;
+        requiredHeadStart += max(0,recordingStartedAt.secsTo(startedAt)) + commDetectLogoSecondsNeeded;
     else
         requiredHeadStart += 30;
 
@@ -1136 +1140 @@
     {
         for (int i=0;i<COMM_FORMAT_MAX;i++) formatCounts[i]=0;
 
-        for(long long i = 0; i < framesProcessed; i++ )
+        for(long long i = (max(0,recordingStartedAt.secsTo(startedAt))*(long)fps); 
+                i < (framesProcessed - (max(0,stopsAt.secsTo(recordingStopsAt))*(long)fps));
+                i++ )
             formatCounts[frameInfo[i].format]++;
 
         for(int i = 0; i < COMM_FORMAT_MAX; i++)
@@ -2538 +2544 @@
         nvp->DiscardVideoFrame(nvp->GetRawVideoFrame(0));
 
         loops = 0;
-        seekFrame = seekIncrement;
+        seekFrame = max(0,recordingStartedAt.secsTo(startedAt)) + seekIncrement;
 
         while(loops < maxLoops && !nvp->GetEof())
         {

programs/mythcommflag/ClassicCommDetector.h

@@ -12 +12 @@
     public:
         ClassicCommDetector(int commDetectMethod, bool showProgress,
                             bool fullSpeed, NuppelVideoPlayer* nvp,
+                            const QDateTime& startedAt,
+                            const QDateTime& stopsAt,
                             const QDateTime& recordingStartedAt,
                             const QDateTime& recordingStopsAt_in);
         virtual ~ClassicCommDetector();
@@ -94 +96 @@
         bool showProgress;
         bool fullSpeed;
         NuppelVideoPlayer *nvp;
+        QDateTime startedAt, stopsAt;
         QDateTime recordingStartedAt, recordingStopsAt;
         bool stillRecording;
         QMap<long long,int> lastSentCommBreakMap;

programs/mythcommflag/CommDetectorFactory.cpp

@@ -8 +8 @@
     CommDetectorFactory::makeCommDetector(int commDetectMethod,
                                           bool showProgress, bool fullSpeed,
                                           NuppelVideoPlayer* nvp,
+                                          const QDateTime& startedAt,
+                                          const QDateTime& stopsAt,
                                           const QDateTime& recordingStartedAt,
                                           const QDateTime& recordingStopsAt)
 {
@@ -16 +18 @@
                 //Future different CommDetect implementations will be created here.
         default:
                         return new ClassicCommDetector(commDetectMethod, showProgress,
-                                           fullSpeed, nvp, recordingStartedAt,
+                                           fullSpeed, nvp, startedAt,
+                                           stopsAt, recordingStartedAt,
                                            recordingStopsAt);
         }
         

programs/mythcommflag/CommDetectorFactory.h

@@ -25 +25 @@
 
         CommDetectorBase* makeCommDetector(int commDetectMethod, bool showProgress,
                                        bool fullSpeed, NuppelVideoPlayer* nvp,
+                                       const QDateTime& startedAt,
+                                       const QDateTime& stopsAt,
                                        const QDateTime& recordingStartedAt,
-                                       const QDateTime& recordingStopsAt_in);
+                                       const QDateTime& recordingStopsAt);
 };
 
 #endif

programs/mythcommflag/main.cpp

@@ -301 +301 @@
     CommDetectorFactory factory;
     commDetector = factory.makeCommDetector(commDetectMethod, showPercentage,
                                             fullSpeed, nvp,
+                                            program_info->startts,
+                                            program_info->endts,
                                             program_info->recstartts,
                                             program_info->recendts);