Ticket #10793: 20141111-26-helen-mcf-bytesperline.patch

mythtv/programs/mythcommflag/ClassicCommDetector.cpp

@@ -139 +139 @@
     totalMinBrightness(0),                     detectBlankFrames(false),
     detectSceneChanges(false),                 detectStationLogo(false),
     logoInfoAvailable(false),                  logoDetector(0),
-    framePtr(0),                               frameIsBlank(false),
+    frameIsBlank(false),
     sceneHasChanged(false),                    stationLogoPresent(false),
     lastFrameWasBlank(false),                  lastFrameWasSceneChange(false),
     decoderFoundAspectChanges(false),          sceneChangeDetector(0),
@@ -265 +265 @@
     frameIsBlank = false;
     stationLogoPresent = false;
 
-    framePtr = NULL;
-
     logoInfoAvailable = false;
 
     ClearAllMaps();
@@ -780 +778 @@
     }
 
     curFrameNumber = frame_number;
-    framePtr = frame->buf;
+    unsigned char* framePtr = frame->buf;
+    int bytesPerLine = frame->pitches[0];
 
     fInfo.minBrightness = -1;
     fInfo.maxBrightness = -1;
@@ -817 +816 @@
 
     if (commDetectMethod & COMM_DETECT_SCENE)
     {
-        sceneChangeDetector->processFrame(framePtr);
+        sceneChangeDetector->processFrame(frame);
     }
 
     stationLogoPresent = false;
@@ -828 +827 @@
         for(int x = commDetectBorder; x < (width - commDetectBorder);
                 x += horizSpacing)
         {
-            pixel = framePtr[y * width + x];
+            pixel = framePtr[y * bytesPerLine + x];
 
             if (commDetectMethod & COMM_DETECT_BLANKS)
             {
@@ -947 +946 @@
     if ((logoInfoAvailable) && (commDetectMethod & COMM_DETECT_LOGO))
     {
         stationLogoPresent =
-            logoDetector->doesThisFrameContainTheFoundLogo(framePtr);
+            logoDetector->doesThisFrameContainTheFoundLogo(frame);
     }
 
 #if 0

mythtv/programs/mythcommflag/ClassicCommDetector.h

@@ -153 +153 @@
         bool logoInfoAvailable;
         LogoDetectorBase* logoDetector;
 
-        unsigned char *framePtr;
-
         frm_dir_map_t blankFrameMap;
         frm_dir_map_t blankCommMap;
         frm_dir_map_t blankCommBreakMap;

mythtv/programs/mythcommflag/ClassicLogoDetector.cpp

@@ -7 +7 @@
 // MythTV headers
 #include "mythcorecontext.h"
 #include "mythplayer.h"
+#include "mythframe.h"
 
 // Commercial Flagging headers
 #include "ClassicLogoDetector.h"
@@ -441 +442 @@
  * which are partially mods based on Myth's original commercial skip
  * code written by Chris Pinkham. */
 bool ClassicLogoDetector::doesThisFrameContainTheFoundLogo(
-    unsigned char* framePtr)
+    VideoFrame* frame)
 {
     int radius = 2;
     unsigned int x, y;
     int pos1, pos2, pos3;
+    int edgePos;
     int pixel;
     int goodEdges = 0;
     int badEdges = 0;
     int testEdges = 0;
     int testNotEdges = 0;
 
+    unsigned char* framePtr = frame->buf;
+    int bytesPerLine = frame->pitches[0];
+
     for (y = logoMinY; y <= logoMaxY; y++ )
     {
         for (x = logoMinX; x <= logoMaxX; x++ )
         {
-            pos1 = y * width + x;
-            pos2 = (y - radius) * width + x;
-            pos3 = (y + radius) * width + x;
+            pos1 = y * bytesPerLine + x;
+            edgePos = y * width + x;
+            pos2 = (y - radius) * bytesPerLine + x;
+            pos3 = (y + radius) * bytesPerLine + x;
 
             pixel = framePtr[pos1];
 
-            if (edgeMask[pos1].horiz)
+            if (edgeMask[edgePos].horiz)
             {
                 if ((abs(framePtr[pos1 - radius] - pixel) >= logoEdgeDiff) ||
                     (abs(framePtr[pos1 + radius] - pixel) >= logoEdgeDiff))
@@ -477 +483 @@
                 testNotEdges++;
             }
 
-            if (edgeMask[pos1].vert)
+            if (edgeMask[edgePos].vert)
             {
                 if ((abs(framePtr[pos2] - pixel) >= logoEdgeDiff) ||
                     (abs(framePtr[pos3] - pixel) >= logoEdgeDiff))
@@ -520 +526 @@
 {
     int r = 2;
     unsigned char *buf = frame->buf;
+    int bytesPerLine = frame->pitches[0];
     unsigned char p;
     unsigned int pos, x, y;
 
@@ -536 +543 @@
                 continue;
 
             pos = y * width + x;
-            p = buf[pos];
+            p = buf[y * bytesPerLine + x];
 
-            if (( abs(buf[y * width + (x - r)] - p) >= edgeDiff) ||
-                ( abs(buf[y * width + (x + r)] - p) >= edgeDiff))
+            if (( abs(buf[y * bytesPerLine + (x - r)] - p) >= edgeDiff) ||
+                ( abs(buf[y * bytesPerLine + (x + r)] - p) >= edgeDiff))
             {
                 edges[pos].horiz++;
                 edgeCount++;
             }
-            if (( abs(buf[(y - r) * width + x] - p) >= edgeDiff) ||
-                ( abs(buf[(y + r) * width + x] - p) >= edgeDiff))
+            if (( abs(buf[(y - r) * bytesPerLine + x] - p) >= edgeDiff) ||
+                ( abs(buf[(y + r) * bytesPerLine + x] - p) >= edgeDiff))
             {
                 edges[pos].vert++;
                 edgeCount++;
             }
 
-            if (( abs(buf[(y - r) * width + (x - r)] - p) >= edgeDiff) ||
-                ( abs(buf[(y + r) * width + (x + r)] - p) >= edgeDiff))
+            if (( abs(buf[(y - r) * bytesPerLine + (x - r)] - p) >= edgeDiff) ||
+                ( abs(buf[(y + r) * bytesPerLine + (x + r)] - p) >= edgeDiff))
             {
                 edges[pos].ldiag++;
                 edgeCount++;
             }
 
-            if (( abs(buf[(y - r) * width + (x + r)] - p) >= edgeDiff) ||
-                ( abs(buf[(y + r) * width + (x - r)] - p) >= edgeDiff))
+            if (( abs(buf[(y - r) * bytesPerLine + (x + r)] - p) >= edgeDiff) ||
+                ( abs(buf[(y + r) * bytesPerLine + (x - r)] - p) >= edgeDiff))
             {
                 edges[pos].rdiag++;
                 edgeCount++;

mythtv/programs/mythcommflag/ClassicLogoDetector.h

@@ -16 +16 @@
     virtual void deleteLater(void);
 
     bool searchForLogo(MythPlayer* player);
-    bool doesThisFrameContainTheFoundLogo(unsigned char* frame);
+    bool doesThisFrameContainTheFoundLogo(VideoFrame* frame);
     bool pixelInsideLogo(unsigned int x, unsigned int y);
 
     unsigned int getRequiredAvailableBufferForSearch();

mythtv/programs/mythcommflag/ClassicSceneChangeDetector.cpp

@@ -25 +25 @@
     SceneChangeDetectorBase::deleteLater();
 }
 
-void ClassicSceneChangeDetector::processFrame(unsigned char* frame)
+void ClassicSceneChangeDetector::processFrame(VideoFrame* frame)
 {
     histogram->generateFromImage(frame, width, height, commdetectborder,
                                  width-commdetectborder, commdetectborder,

mythtv/programs/mythcommflag/ClassicSceneChangeDetector.h

@@ -13 +13 @@
         unsigned int yspacing);
     virtual void deleteLater(void);
 
-    void processFrame(unsigned char* frame);
+    void processFrame(VideoFrame* frame);
 
   private:
     ~ClassicSceneChangeDetector() {}

mythtv/programs/mythcommflag/Histogram.cpp

@@ -3 +3 @@
 #include <cmath>
 #include <cstring>
 
+#include "mythframe.h"
+
 Histogram::Histogram()
 {
     memset(data,0,sizeof(data));
@@ -15 +17 @@
 {
 }
 
-void Histogram::generateFromImage(unsigned char* frame, unsigned int frameWidth,
+void Histogram::generateFromImage(VideoFrame* frame, unsigned int frameWidth,
          unsigned int frameHeight, unsigned int minScanX, unsigned int maxScanX,
          unsigned int minScanY, unsigned int maxScanY, unsigned int XSpacing,
          unsigned int YSpacing)
@@ -29 +31 @@
     if (maxScanY > frameHeight-1)
         maxScanY = frameHeight-1;
 
+    unsigned char* framePtr = frame->buf;
+    int bytesPerLine = frame->pitches[0];
     for(unsigned int y = minScanY; y < maxScanY; y += YSpacing)
         for(unsigned int x = minScanX; x < maxScanX; x += XSpacing)
         {
-            data[frame[y * frameWidth + x]]++;
+            data[framePtr[y * bytesPerLine + x]]++;
             numberOfSamples++;
         }
 }

mythtv/programs/mythcommflag/Histogram.h

@@ -1 +1 @@
 #ifndef _HISTOGRAM_H_
 #define _HISTOGRAM_H_
 
+typedef struct VideoFrame_ VideoFrame;
+
 class Histogram
 {
 public:
     Histogram();
     ~Histogram();
 
-    void generateFromImage(unsigned char* frame, unsigned int frameWidth,
+    void generateFromImage(VideoFrame* frame, unsigned int frameWidth,
              unsigned int frameHeight, unsigned int minScanX,
              unsigned int maxScanX, unsigned int minScanY,
              unsigned int maxScanY, unsigned int XSpacing,

mythtv/programs/mythcommflag/LogoDetectorBase.h

@@ -4 +4 @@
 #include <QObject>
 
 class MythPlayer;
+typedef struct VideoFrame_ VideoFrame;
 
 class LogoDetectorBase : public QObject
 {
@@ -14 +15 @@
         foundLogo(false), width(w),height(h) {};
 
     virtual bool searchForLogo(MythPlayer* player) = 0;
-    virtual bool doesThisFrameContainTheFoundLogo(unsigned char* frame) = 0;
+    virtual bool doesThisFrameContainTheFoundLogo(VideoFrame* frame) = 0;
     virtual bool pixelInsideLogo(unsigned int x, unsigned int y) = 0;
     virtual unsigned int getRequiredAvailableBufferForSearch() = 0;
 

mythtv/programs/mythcommflag/SceneChangeDetectorBase.h

@@ -3 +3 @@
 
 #include <QObject>
 
+typedef struct VideoFrame_ VideoFrame;
+
 class SceneChangeDetectorBase : public QObject
 {
     Q_OBJECT
@@ -11 +13 @@
     SceneChangeDetectorBase(unsigned int w, unsigned int h) :
         width(w), height(h) {}
 
-    virtual void processFrame(unsigned char *frame) = 0;
+    virtual void processFrame(VideoFrame* frame) = 0;
 
   signals:
     void haveNewInformation(unsigned int framenum, bool scenechange,