VideoProperties: analyseGopStructure returns nb decoded frames

Clement Champetier · Clement Champetier · commit c33fb0f19754 · 2016-11-21T16:17:28.000+01:00
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -509,24 +509,24 @@ std::vector<std::pair<char, int> > VideoProperties::getGopStructure() const
     return _gopStructure;
 }
 
-void VideoProperties::analyseGopStructure(IProgress& progress)
+size_t VideoProperties::analyseGopStructure(IProgress& progress)
 {
     if(! _formatContext || ! _codecContext || ! _codec)
-        return;
+        return 0;
     if(! _codecContext->width || ! _codecContext->height)
-        return;
+        return 0;
 
     InputFile& file = const_cast<InputFile&>(_fileProperties->getInputFile());
     // Get the stream
     IInputStream& stream = file.getStream(_streamIndex);
     stream.activate();
     // Create a decoder
     VideoDecoder decoder(static_cast<InputStream&>(stream));
+    VideoFrame frame(VideoFrameDesc(getWidth(), getHeight(), getPixelFormatName(getPixelProperties().getAVPixelFormat())), false);
 
-    size_t count = 0;
+    size_t nbDecodedFrames = 0;
     int positionOfFirstKeyFrame = -1;
     int positionOfLastKeyFrame = -1;
-    VideoFrame frame(VideoFrameDesc(getWidth(), getHeight(), getPixelFormatName(getPixelProperties().getAVPixelFormat())), false);
     while(decoder.decodeNextFrame(frame))
     {
         AVFrame& avFrame = frame.getAVFrame();
@@ -538,12 +538,12 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
         if(avFrame.pict_type == AV_PICTURE_TYPE_I)
         {
             if(positionOfFirstKeyFrame == -1)
-                positionOfFirstKeyFrame = count;
+                positionOfFirstKeyFrame = nbDecodedFrames;
             else
-                positionOfLastKeyFrame = count;
+                positionOfLastKeyFrame = nbDecodedFrames;
         }
 
-        _gopSize = ++count;
+        _gopSize = ++nbDecodedFrames;
 
         // If the first 2 key frames are found
         if(positionOfFirstKeyFrame != -1 && positionOfLastKeyFrame != -1)
@@ -565,6 +565,7 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
     {
         throw std::runtime_error("Invalid GOP size when decoding the first data.");
     }
+    return nbDecodedFrames;
 }
 
 void VideoProperties::analyseFull(IProgress& progress)
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -105,8 +105,9 @@ class AvExport VideoProperties : public StreamProperties
 private:
     /**
      * @param progress: callback to get analysis progression
+     * @return the number of decoded frames to compute the GOP structure.
      */
-    void analyseGopStructure(IProgress& progress);
+    size_t analyseGopStructure(IProgress& progress);
 
     /**
      * @param progress: callback to get analysis progression
