Added dumping findings to a file, standardizing PTS

Author: Beirdo

mythtv/programs/mythgpucommflag/audioconsumer.cpp

@@ -1,3 +1,5 @@
+#include <strings.h>
+
 #include "mythlogging.h"
 #include "packetqueue.h"
 #include "resultslist.h"
@@ -41,6 +43,12 @@ void AudioConsumer::ProcessPacket(Packet *packet)
         m_codec = avcodec_find_decoder(curstream->codec->codec_id);
         if (avcodec_open(m_context, m_codec) < 0)
             return;
+
+        m_stream = curstream;
+
+        memcpy(&m_timebase, &curstream->time_base, sizeof(m_timebase));
+        LOG(VB_GENERAL, LOG_NOTICE, QString("Audio: num = %1, den = %2")
+            .arg(m_timebase.num) .arg(m_timebase.den));
         m_opened = true;
     }
 
@@ -109,7 +117,7 @@ void AudioConsumer::ProcessFrame(int16_t *samples, int size, int frames,
     LOG(VB_GENERAL, LOG_INFO, QString("Audio Frame: %1 samples (%2 size)")
         .arg(frames).arg(size));
 
-    uint64_t duration = (uint64_t)((double)(frames * 1000) / rate);
+    int duration = (int)((double)(frames * 1000000) / (rate * 1.0));
     AudioPacket *audioPacket = NULL;
 
     // Push PCM frame to GPU/CPU Processing memory
@@ -132,9 +140,12 @@ void AudioConsumer::ProcessFrame(int16_t *samples, int size, int frames,
         // Toss the results onto the results list
         if (result)
         {
+            static AVRational realTimeBase = { 1, 1000 };
             LOG(VB_GENERAL, LOG_INFO, "Audio Finding found");
-            result->m_pts = pts;
+            pts = av_rescale_q(pts, realTimeBase, m_timebase);
+            result->m_timestamp = NormalizeTimecode(pts);;
             result->m_duration = duration;
+            LOG(VB_GENERAL, LOG_INFO, result->toString());
             m_outL->append(result);
         }
     }
@@ -146,6 +157,7 @@ void AudioConsumer::ProcessFrame(int16_t *samples, int size, int frames,
     }
 }
 
+
 /*
  * vim:ts=4:sw=4:ai:et:si:sts=4
  */

mythtv/programs/mythgpucommflag/findingdefs.h

@@ -0,0 +1,48 @@
+#ifndef _FINDINGDEFS_H
+#define _FINDINGDEFS_H
+
+#undef FINDINGS_PREAMBLE
+#undef FINDINGS_POSTAMBLE
+#undef FINDINGS_MAP
+
+// names are expected to start with kFinding
+// value is the enumerated value (0-xxxxx)
+// desc is descriptive text used for dumping results
+
+#ifdef _IMPLEMENT_FINDINGS
+
+// This actually will implement the mapping in resultslist.cpp
+#define FINDINGS_PREAMBLE
+#define FINDINGS_POSTAMBLE
+#define FINDINGS_MAP(name,value,desc) \
+    findingsAdd((int)value,QString(desc));
+
+#else
+
+// This is used to define the enumerated type (used by all files)
+
+#define FINDINGS_PREAMBLE \
+    typedef enum {
+#define FINDINGS_POSTAMBLE \
+        kFindingsLastItem \
+    } FlagFindingsType;
+#define FINDINGS_MAP(name,value,desc) \
+        name = (int)(value),
+
+#endif
+
+FINDINGS_PREAMBLE
+FINDINGS_MAP(kFindingAudioHigh,         0, "Audio more than 6dB above average")
+FINDINGS_MAP(kFindingAudioLow,          1, "Audio more than 12dB below average")
+FINDINGS_MAP(kFindingVideoBlankFrame,   2, "Blank video frame")
+FINDINGS_MAP(kFindingVideoSceneChange,  3, "Video scene change")
+FINDINGS_MAP(kFindingVideoAspectChange, 4, "Video aspect ratio change")
+FINDINGS_MAP(kFindingVideoLogoChange,   5, "Video logo presence change")
+FINDINGS_POSTAMBLE
+
+#endif
+
+/*
+ * vim:ts=4:sw=4:ai:et:si:sts=4
+ */
+

mythtv/programs/mythgpucommflag/main.cpp

@@ -4,6 +4,7 @@ using namespace std;
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QX11Info>
+#include <QFile>
 
 #include "exitcodes.h"
 #include "mythcontext.h"
@@ -307,6 +308,9 @@ int main(int argc, char **argv)
     ResultsList audioMarks;
     ResultsList videoMarks;
 
+    // Initialize the findings map
+    FindingsInitialize();
+
     // Create consumer threads
     AudioConsumer *audioThread = new AudioConsumer(&audioQ, &audioMarks,
                                                    devices[1]);
@@ -338,6 +342,15 @@ int main(int argc, char **argv)
     LOG(VB_GENERAL, LOG_INFO, QString("audioMarks: %1, videoMarks: %2")
         .arg(audioMarks.size()) .arg(videoMarks.size()));
 
+    // Dump results to an output file
+    QFile dump("out/results");
+    dump.open(QIODevice::WriteOnly);
+    QString audioDump = audioMarks.toString("Audio markings");
+    QString videoDump = videoMarks.toString("Video markings");
+    dump.write(audioDump.toAscii());
+    dump.write(videoDump.toAscii());
+    dump.close();
+
     // Loop:
         // Summarize the various criteria to get commercial flag map
 

mythtv/programs/mythgpucommflag/mythgpucommflag.pro

@@ -31,7 +31,7 @@ LIBS += -lOpenCL -lglut -lGLEW
 HEADERS += commandlineparser.h
 HEADERS += openclinterface.h openglsupport.h
 HEADERS += packetqueue.h
-HEADERS += resultslist.h
+HEADERS += resultslist.h findingdefs.h
 HEADERS += gpuplayer.h
 HEADERS += queueconsumer.h audioconsumer.h videoconsumer.h
 HEADERS += audioprocessor.h videoprocessor.h
@@ -40,7 +40,7 @@ HEADERS += videodecoder.h vdpauvideodecoder.h ffmpegvideodecoder.h
 
 SOURCES += main.cpp commandlineparser.cpp
 SOURCES += openclinterface.cpp
-SOURCES += packetqueue.cpp
+SOURCES += packetqueue.cpp resultslist.cpp
 SOURCES += gpuplayer.cpp
 SOURCES += queueconsumer.cpp audioconsumer.cpp videoconsumer.cpp
 SOURCES += audioprocessor.cpp videoprocessor.cpp

mythtv/programs/mythgpucommflag/openclvideoprocessor.cpp

@@ -2100,7 +2100,6 @@ FlagResults *OpenCLSceneChangeDetect(OpenCLDevice *dev, AVFrame *frame,
 
         if (found)
         {
-#define DEBUG_VIDEO
 #ifdef DEBUG_VIDEO
             videoPacket->m_prevFrameRGB->Dump("rgb", frameNum-1, 1);
             videoPacket->m_croppedRGB->Dump("rgb", frameNum, 1);

mythtv/programs/mythgpucommflag/queueconsumer.cpp

@@ -36,6 +36,38 @@ void QueueConsumer::run(void)
 }
 
 
+int64_t QueueConsumer::NormalizeTimecode(int64_t timecode)
+{
+    int64_t start_pts = 0;
+
+    if (m_stream->start_time != (int64_t)AV_NOPTS_VALUE)
+        start_pts = m_stream->start_time;
+
+    int64_t pts = timecode - start_pts;
+
+    pts = av_rescale(pts, 1000000 * m_timebase.num, m_timebase.den);
+
+#ifdef DEBUG_TIMESTAMP
+    LOG(VB_GENERAL, LOG_INFO, QString("Timecode %1, Start %2, Normalized %3 us")
+        .arg(timecode) .arg(start_pts) .arg(pts));
+#endif
+    return pts;
+}
+
+int64_t QueueConsumer::NormalizeDuration(int64_t duration)
+{
+    int64_t retval;
+
+    retval = av_rescale(duration, m_timebase.num * 1000000, m_timebase.den);
+
+#ifdef DEBUG_TIMESTAMP
+    LOG(VB_GENERAL, LOG_INFO, QString("Duration %1, Normalized %2 us")
+        .arg(duration) .arg(retval));
+#endif
+    return retval;
+}
+
+
 /*
  * vim:ts=4:sw=4:ai:et:si:sts=4
  */

mythtv/programs/mythgpucommflag/queueconsumer.h

@@ -12,10 +12,13 @@ class QueueConsumer : public MThread
     QueueConsumer(PacketQueue *inQ, ResultsList *outL, OpenCLDevice *dev,
                   QString name) : 
         MThread(name), m_name(name), m_inQ(inQ), m_outL(outL), m_done(false),
-        m_dev(dev), m_context(NULL), m_codec(NULL), m_opened(false) {};
+        m_dev(dev), m_context(NULL), m_codec(NULL), m_stream(NULL),
+        m_opened(false) {};
     ~QueueConsumer() {};
     virtual bool Initialize(void) = 0;
     virtual void ProcessPacket(Packet *packet) = 0;
+    int64_t NormalizeTimecode(int64_t timecode);
+    int64_t NormalizeDuration(int64_t duration);
 
     void run(void);
     void done(void)  { m_done = true; m_inQ->stop(); }
@@ -27,6 +30,8 @@ class QueueConsumer : public MThread
     OpenCLDevice *m_dev;
     AVCodecContext *m_context;
     AVCodec *m_codec;
+    AVStream *m_stream;
+    AVRational m_timebase;
     bool m_opened;
 };
 

mythtv/programs/mythgpucommflag/resultslist.cpp

@@ -0,0 +1,67 @@
+#include <QList>
+#include <QMap>
+#include <QString>
+
+#include "resultslist.h"
+#include "mythlogging.h"
+
+FlagFindingsMap findingsMap;
+
+void findingsAdd(int value, QString description);
+
+void FindingsInitialize(void)
+{
+#undef _FINDINGDEFS_H
+#define _IMPLEMENT_FINDINGS
+#include "findingdefs.h"
+}
+
+void findingsAdd(int value, QString description)
+{
+    LOG(VB_GENERAL, LOG_DEBUG, QString("FindingsMap: Inserting %1:%2")
+        .arg(value) .arg(description));
+    findingsMap.insert(value, description);
+}
+
+QString FlagFindings::toString(void)
+{
+    QString finding = QString("Unknown finding (%1)").arg(m_type);
+    if (findingsMap.contains((int)m_type))
+        finding = findingsMap.value((int)m_type);
+
+    QString str = QString("%1: %2").arg(finding).arg(m_value);
+    return str;
+}
+
+QString FlagResults::toString(void)
+{
+    FlagFindingsList::iterator it;
+
+    QString str = QString("Findings at PTS: %1, Duration: %2\n")
+        .arg(m_timestamp) .arg(m_duration);
+
+    for (it = m_findings->begin(); it != m_findings->end(); ++it)
+    {
+        FlagFindings *finding = *it;
+        str += QString("    %1\n").arg(finding->toString());
+    }
+    str += QString("\n");
+    return str;
+}
+
+QString ResultsList::toString(QString title)
+{
+    ResultsList::iterator it;
+    QString str = QString("-----------------------------\n%1\n\n").arg(title);
+
+    for (it = begin(); it != end(); ++it)
+    {
+        FlagResults *results = *it;
+        str += results->toString();
+    }
+    return str;
+}
+
+/*
+ * vim:ts=4:sw=4:ai:et:si:sts=4
+ */

mythtv/programs/mythgpucommflag/resultslist.h

@@ -2,25 +2,20 @@
 #define _RESULTSLIST_H
 
 #include <QList>
+#include <QMap>
 
 extern "C" {
 #include "libavcodec/avcodec.h"
 }
 
-typedef enum {
-    kFindingAudioHigh,
-    kFindingAudioLow,
-    kFindingVideoBlankFrame,
-    kFindingVideoSceneChange,
-    kFindingVideoAspectChange,
-    kFindingVideoLogoChange
-} FlagFindingsType;
+#include "findingdefs.h"
 
 class FlagFindings
 {
   public:
     FlagFindings(int type, int64_t value) : m_type(type), m_value(value) {};
     ~FlagFindings() {};
+    QString toString(void);
 
     int m_type;
     int64_t m_value;
@@ -34,28 +29,28 @@ class FlagResults
     FlagResults(AVPacket *pkt, FlagFindingsList *list) : m_findings(list)
     {
         m_valid = (pkt != NULL);
-        if (m_valid)
-        {
-            m_pts = pkt->pts;
-            m_dts = pkt->dts;
-            m_duration = pkt->duration;
-            m_pos = pkt->pos;
-        }
     }
 
     FlagResults(FlagFindingsList *list) : m_findings(list) {};
     ~FlagResults() { delete m_findings; };
+    QString toString(void);
 
     bool    m_valid;
-    int64_t m_pts;
-    int64_t m_dts;
+    int64_t m_timestamp;
     int     m_duration;
-    int64_t m_pos;
 
     FlagFindingsList *m_findings;
 };
 
-typedef QList<FlagResults *> ResultsList;
+class ResultsList : public QList<FlagResults *>
+{
+  public:
+    QString toString(QString title);
+};
+
+typedef QMap<int, QString> FlagFindingsMap;
+
+void FindingsInitialize(void);
 
 #endif