IDecoder: add decoded frames counter

valnoel · valnoel · commit c06898bbccb1 · 2020-06-26T11:44:42.000+02:00
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -121,6 +121,10 @@ bool AudioDecoder::decodeNextFrame(IFrame& frameBuffer)
             return false;
         }
     }
+
+    if(decodeNextFrame)
+        incrementNbDecodedFrames(frameBuffer.getAVFrame().nb_samples);
+
     return decodeNextFrame;
 }
 
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -58,6 +58,8 @@ bool AudioGenerator::decodeNextFrame(IFrame& frameBuffer)
         LOG_DEBUG("Convert data of the audio specified when decode next frame")
         _audioTransform.convert(*_inputFrame, frameBuffer);
     }
+
+    incrementNbDecodedFrames(_silent->getNbSamplesPerChannel());
     return true;
 }
 
diff --git a/src/AvTranscoder/decoder/IDecoder.hpp b/src/AvTranscoder/decoder/IDecoder.hpp
@@ -10,7 +10,16 @@ namespace avtranscoder
 
 class AvExport IDecoder
 {
+protected:
+    IDecoder::IDecoder()
+        : _decoded_frames_counter(0)
+    {
+    }
+
 public:
+
+
+
     virtual ~IDecoder(){};
 
     /**
@@ -51,6 +60,16 @@ class AvExport IDecoder
      * @note Not sense for generators.
      */
     virtual void flushDecoder() {}
+
+    size_t getNbDecodedFrames() { return _decoded_frames_counter; }
+
+protected:
+    void incrementNbDecodedFrames(const size_t& nb_frames = 1) {
+        _decoded_frames_counter += nb_frames;
+    }
+
+private:
+    size_t _decoded_frames_counter;
 };
 }
 
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -114,6 +114,10 @@ bool VideoDecoder::decodeNextFrame(IFrame& frameBuffer)
             return false;
         }
     }
+
+    if(decodeNextFrame)
+        incrementNbDecodedFrames();
+
     return decodeNextFrame;
 }
 
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -51,6 +51,8 @@ bool VideoGenerator::decodeNextFrame(IFrame& frameBuffer)
         LOG_DEBUG("Convert data of the image specified when decode next frame")
         _videoTransform.convert(*_inputFrame, frameBuffer);
     }
+
+    incrementNbDecodedFrames();
     return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ bool AudioDecoder::decodeNextFrame(IFrame& frameBuffer)`
`121`	`121`	`return false;`
`122`	`122`	`}`
`123`	`123`	`}`
	`124`	`+`
	`125`	`+ if(decodeNextFrame)`
	`126`	`+ incrementNbDecodedFrames(frameBuffer.getAVFrame().nb_samples);`
	`127`	`+`
`124`	`128`	`return decodeNextFrame;`
`125`	`129`	`}`
`126`	`130`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ bool AudioGenerator::decodeNextFrame(IFrame& frameBuffer)`
`58`	`58`	`LOG_DEBUG("Convert data of the audio specified when decode next frame")`
`59`	`59`	`_audioTransform.convert(*_inputFrame, frameBuffer);`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ incrementNbDecodedFrames(_silent->getNbSamplesPerChannel());`
`61`	`63`	`return true;`
`62`	`64`	`}`
`63`	`65`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,10 @@ bool VideoDecoder::decodeNextFrame(IFrame& frameBuffer)`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`	`}`
	`117`	`+`
	`118`	`+ if(decodeNextFrame)`
	`119`	`+ incrementNbDecodedFrames();`
	`120`	`+`
`117`	`121`	`return decodeNextFrame;`
`118`	`122`	`}`
`119`	`123`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ bool VideoGenerator::decodeNextFrame(IFrame& frameBuffer)`
`51`	`51`	`LOG_DEBUG("Convert data of the image specified when decode next frame")`
`52`	`52`	`_videoTransform.convert(*_inputFrame, frameBuffer);`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+ incrementNbDecodedFrames();`
`54`	`56`	`return true;`
`55`	`57`	`}`
`56`	`58`