take pts directly from frame for audio filters

bavc · Aug 26, 2023 · fef460e · fef460e
1 parent f832ad1
commit fef460e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/Source/Core/AudioStats.cpp b/Source/Core/AudioStats.cpp
@@ -176,8 +176,9 @@ void AudioStats::parseFrame(tinyxml2::XMLElement *Frame)
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void AudioStats::StatsFromFrame (struct AVFrame* Frame, int, int)
+void AudioStats::StatsFromFrame (const QAVFrame& frame, int, int)
 {
+    auto Frame = frame.frame();
     AVDictionary * m= Frame->metadata;
     AVDictionaryEntry* e=NULL;
     bool statsMapInitialized = !statsValueInfoByKeys.empty();
@@ -249,8 +250,10 @@ void AudioStats::StatsFromFrame (struct AVFrame* Frame, int, int)
 }
 
 //---------------------------------------------------------------------------
-void AudioStats::TimeStampFromFrame (struct AVFrame* Frame, size_t FramePos)
+void AudioStats::TimeStampFromFrame (const QAVFrame& frame, size_t FramePos)
 {
+    auto Frame = frame.frame();
+
     if (Frequency==0)
         return; // Not supported
 
@@ -259,9 +262,13 @@ void AudioStats::TimeStampFromFrame (struct AVFrame* Frame, size_t FramePos)
 
     x[0][FramePos]=FramePos;
 
+    /* can't use old way, take pts directly from frame
     int64_t ts=(Frame->pts == AV_NOPTS_VALUE)?Frame->pkt_dts : Frame->pts; // Using DTS is PTS is not available
     if (ts==AV_NOPTS_VALUE && FramePos)
         ts=(int64_t)((FirstTimeStamp+x[1][FramePos-1]+durations[FramePos-1])*Frequency); // If time stamp is not present, creating a fake one from last frame duration
+    */
+
+    int64_t ts = frame.pts() * 1000;
     if (ts!=AV_NOPTS_VALUE)
     {
         if (FirstTimeStamp==DBL_MAX)

diff --git a/Source/Core/AudioStats.h b/Source/Core/AudioStats.h
@@ -32,8 +32,8 @@ class AudioStats : public CommonStats
 
     // External data
     virtual void parseFrame(tinyxml2::XMLElement* frame);
-    void                        StatsFromFrame(struct AVFrame* Frame, int Width, int Height);
-    void                        TimeStampFromFrame(struct AVFrame* Frame, size_t FramePos);
+    void                        StatsFromFrame(const QAVFrame& Frame, int Width, int Height);
+    void                        TimeStampFromFrame(const QAVFrame& Frame, size_t FramePos);
     std::string                      StatsToXML(const activefilters& filters);
 };
 

diff --git a/Source/Core/CommonStats.h b/Source/Core/CommonStats.h
@@ -28,6 +28,7 @@ namespace tinyxml2 {
     class XMLElement;
 }
 
+class QAVFrame;
 class CommonStats
 {
 public:
@@ -70,8 +71,8 @@ class CommonStats
 
     // External data
             void                StatsFromExternalData_Finish() {Frequency=1; StatsFinish();}
-    virtual void                StatsFromFrame(struct AVFrame* Frame, int Width, int Height) = 0;
-    virtual void                TimeStampFromFrame(struct AVFrame* Frame, size_t FramePos) = 0;
+    virtual void                StatsFromFrame(const QAVFrame& Frame, int Width, int Height) = 0;
+    virtual void                TimeStampFromFrame(const QAVFrame& Frame, size_t FramePos) = 0;
     virtual void                StatsFinish();
     virtual std::string              StatsToXML(const activefilters& filters) = 0;
 

diff --git a/Source/Core/FileInformation.cpp b/Source/Core/FileInformation.cpp
@@ -994,8 +994,8 @@ FileInformation::FileInformation (SignalServer* signalServer, const QString &Fil
 
                 auto stat = Stats[frame.stream().index()];
 
-                stat->TimeStampFromFrame(frame.frame(), stat->x_Current);
-                stat->StatsFromFrame(frame.frame(), 0, 0);
+                stat->TimeStampFromFrame(frame, stat->x_Current);
+                stat->StatsFromFrame(frame, 0, 0);
 
             },
             // Qt::QueuedConnection
@@ -1008,8 +1008,8 @@ FileInformation::FileInformation (SignalServer* signalServer, const QString &Fil
                 if(frame.filterName() == "stats") {
                     auto stat = Stats[frame.stream().index()];
 
-                    stat->TimeStampFromFrame(frame.frame(), stat->x_Current);
-                    stat->StatsFromFrame(frame.frame(), frame.size().width(), frame.size().height());
+                    stat->TimeStampFromFrame(frame, stat->x_Current);
+                    stat->StatsFromFrame(frame, frame.size().width(), frame.size().height());
 
                 } else if(frame.filterName().startsWith(panelOutputPrefix)) {
                     auto indexString = frame.filterName().mid(panelOutputPrefix.length());

diff --git a/Source/Core/VideoStats.cpp b/Source/Core/VideoStats.cpp
@@ -255,8 +255,9 @@ void VideoStats::parseFrame(tinyxml2::XMLElement *Frame)
 
 //---------------------------------------------------------------------------
 
-void VideoStats::StatsFromFrame (struct AVFrame* Frame, int Width, int Height)
+void VideoStats::StatsFromFrame (const QAVFrame& frame, int Width, int Height)
 {
+    auto Frame = frame.frame();
     AVDictionary * m= Frame->metadata;
     AVDictionaryEntry* e=NULL;
     bool statsMapInitialized = !statsValueInfoByKeys.empty();
@@ -368,8 +369,10 @@ void VideoStats::StatsFromFrame (struct AVFrame* Frame, int Width, int Height)
 }
 
 //---------------------------------------------------------------------------
-void VideoStats::TimeStampFromFrame (struct AVFrame* Frame, size_t FramePos)
+void VideoStats::TimeStampFromFrame (const QAVFrame& frame, size_t FramePos)
 {
+    auto Frame = frame.frame();
+
     if (Frequency==0)
         return; // Not supported
 

diff --git a/Source/Core/VideoStats.h b/Source/Core/VideoStats.h
@@ -33,8 +33,8 @@ class VideoStats : public CommonStats
 
     // External data
     virtual void parseFrame(tinyxml2::XMLElement* frame);
-    void                        StatsFromFrame(struct AVFrame* Frame, int Width, int Height);
-    void                        TimeStampFromFrame(struct AVFrame* Frame, size_t FramePos);
+    void                        StatsFromFrame(const QAVFrame& Frame, int Width, int Height);
+    void                        TimeStampFromFrame(const QAVFrame& Frame, size_t FramePos);
     std::string                      StatsToXML(const activefilters& filters);
 
     int getWidth() const;