Stride fix for comm detector

From: Mark Spieth <mspieth@digivation.com.au>

Fixes framing issue with comm detector with some sources where width is not
real width of image data.
---
 .../programs/mythcommflag/ClassicCommDetector.cpp  |    4 ++--
 .../mythcommflag/ClassicSceneChangeDetector.cpp    |    8 +++++---
 .../mythcommflag/ClassicSceneChangeDetector.h      |    1 -
 mythtv/programs/mythcommflag/CommDetectorBase.h    |    5 +++++
 mythtv/programs/mythcommflag/main.cpp              |    9 +++++++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/mythtv/programs/mythcommflag/ClassicCommDetector.cpp b/mythtv/programs/mythcommflag/ClassicCommDetector.cpp
index d3f67c8..9d0d4d7 100644
--- a/mythtv/programs/mythcommflag/ClassicCommDetector.cpp
+++ b/mythtv/programs/mythcommflag/ClassicCommDetector.cpp
@@ -25,12 +25,12 @@ using namespace std;
 #include "ClassicLogoDetector.h"
 #include "ClassicSceneChangeDetector.h"
 
-enum frameAspects {
+typedef enum frameAspects {
     COMM_ASPECT_NORMAL = 0,
     COMM_ASPECT_WIDE
 } FrameAspects;
 
-enum frameFormats {
+typedef enum frameFormats {
     COMM_FORMAT_NORMAL = 0,
     COMM_FORMAT_LETTERBOX,
     COMM_FORMAT_PILLARBOX,
diff --git a/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.cpp b/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.cpp
index ca96f93..ab89fd7 100644
--- a/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.cpp
+++ b/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.cpp
@@ -1,6 +1,9 @@
 #include <algorithm>
 using namespace std;
 
+// MythTV headers
+#include "mythframe.h"
+
 #include "ClassicSceneChangeDetector.h"
 #include "Histogram.h"
 
@@ -8,7 +11,6 @@ ClassicSceneChangeDetector::ClassicSceneChangeDetector(unsigned int width,
         unsigned int height, unsigned int commdetectborder_in,
         unsigned int xspacing_in, unsigned int yspacing_in):
     SceneChangeDetectorBase(width,height),
-    frameNumber(0),
     previousFrameWasSceneChange(false),
     xspacing(xspacing_in),
     yspacing(yspacing_in),
@@ -27,6 +29,7 @@ void ClassicSceneChangeDetector::deleteLater(void)
 
 void ClassicSceneChangeDetector::processFrame(VideoFrame* frame)
 {
+    width = frame->pitches[0];
     histogram->generateFromImage(frame, width, height, commdetectborder,
                                  width-commdetectborder, commdetectborder,
                                  height-commdetectborder, xspacing, yspacing);
@@ -34,11 +37,10 @@ void ClassicSceneChangeDetector::processFrame(VideoFrame* frame)
 
     bool isSceneChange = (similar < .85 && !previousFrameWasSceneChange);
 
-    emit(haveNewInformation(frameNumber,isSceneChange,similar));
+    emit(haveNewInformation(frame->frameNumber,isSceneChange,similar));
     previousFrameWasSceneChange = isSceneChange;
 
     std::swap(histogram,previousHistogram);
-    frameNumber++;
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.h b/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.h
index a8fd53b..07e281e 100644
--- a/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.h
+++ b/mythtv/programs/mythcommflag/ClassicSceneChangeDetector.h
@@ -21,7 +21,6 @@ class ClassicSceneChangeDetector : public SceneChangeDetectorBase
   private:
     Histogram* histogram;
     Histogram* previousHistogram;
-    unsigned int frameNumber;
     bool previousFrameWasSceneChange;
     unsigned int xspacing, yspacing;
     unsigned int commdetectborder;
diff --git a/mythtv/programs/mythcommflag/CommDetectorBase.h b/mythtv/programs/mythcommflag/CommDetectorBase.h
index 7fee51b..7faefa1 100644
--- a/mythtv/programs/mythcommflag/CommDetectorBase.h
+++ b/mythtv/programs/mythcommflag/CommDetectorBase.h
@@ -11,6 +11,11 @@ using namespace std;
 
 #define MAX_BLANK_FRAMES 180
 
+#define COMM_DETECT_NG 0x400
+#define COMM_DETECT_AUDIO 0x08
+#define COMM_DETECT_SUBTITLES 0x10
+#define COMM_DETECT_NG_OLD 0x80
+
 typedef enum commMapValues {
     MARK_START   = 0,
     MARK_END     = 1,
diff --git a/mythtv/programs/mythcommflag/main.cpp b/mythtv/programs/mythcommflag/main.cpp
index 6db5887..c539f12 100644
--- a/mythtv/programs/mythcommflag/main.cpp
+++ b/mythtv/programs/mythcommflag/main.cpp
@@ -981,6 +981,15 @@ static int FlagCommercials( uint chanid, const QDateTime &starttime,
     }
 
 
+    if (pginfo.GetSubtitle().isEmpty())
+        LOG(VB_GENERAL, LOG_INFO,
+            QString("MythTV Commercial Flagger, flagging commercials for: %1")
+                .arg(pginfo.GetTitle()));
+    else
+        LOG(VB_GENERAL, LOG_INFO,
+            QString("MythTV Commercial Flagger, flagging commercials for: %1 - %2")
+                .arg(pginfo.GetTitle())
+                .arg(pginfo.GetSubtitle()));
     if (progress)
     {
         cerr << "MythTV Commercial Flagger, flagging commercials for:" << endl;