IReader: readFrameAt returns NULL if there is no next frame

Clement Champetier · Clement Champetier · commit 571ec23afafd · 2016-04-01T10:42:56.000+02:00
diff --git a/src/AvTranscoder/reader/IReader.cpp b/src/AvTranscoder/reader/IReader.cpp
@@ -81,11 +81,10 @@ Frame* IReader::readFrameAt(const size_t frame)
         {
            _generator->decodeNextFrame(*_srcFrame);
         }
-        // or return an empty frame
+        // or return NULL
         else
         {
-            _dstFrame->clear();
-            return _dstFrame;
+            return NULL;
         }
     }
     // transform
diff --git a/src/AvTranscoder/reader/IReader.hpp b/src/AvTranscoder/reader/IReader.hpp
@@ -35,16 +35,20 @@ class AvExport IReader
 
     /**
      * @return Get next frame after decoding
+     * @see readFrameAt
      */
     Frame* readNextFrame();
 
     /**
      * @return Get previous frame after decoding
+     * @see readFrameAt
      */
     Frame* readPrevFrame();
 
     /**
      * @return Get indicated frame after decoding
+     * @warn Returns NULL if there is no more frame to read.
+     * @see continueWithGenerator
      */
     Frame* readFrameAt(const size_t frame);
 
diff --git a/test/pyTest/testReader.py b/test/pyTest/testReader.py
@@ -27,9 +27,9 @@ def testVideoReaderCreateNewInputFile():
         bytesPerPixel = reader.getOutputBitDepth() / 8
         assert_equals( frame.getSize(), reader.getOutputWidth() * reader.getOutputHeight() * bytesPerPixel )
 
-    # check if the next frame is empty
-    frame = av.VideoFrame(reader.readNextFrame())
-    assert_equals( frame.getSize(), 0 )
+    # check if there is no next frame
+    frame = reader.readNextFrame()
+    assert_equals( reader.readNextFrame(), None )
 
 
 def testVideoReaderReferenceInputFile():
@@ -47,9 +47,8 @@ def testVideoReaderReferenceInputFile():
         bytesPerPixel = reader.getOutputBitDepth() / 8
         assert_equals( frame.getSize(), reader.getOutputWidth() * reader.getOutputHeight() * bytesPerPixel )
 
-    # check if the next frame is empty
-    frame = av.VideoFrame(reader.readNextFrame())
-    assert_equals( frame.getSize(), 0 )
+    # check if there is no next frame
+    assert_equals( reader.readNextFrame(), None )
 
 
 def testAudioReaderChannelsExtraction():

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,10 @@ Frame* IReader::readFrameAt(const size_t frame)`
`81`	`81`	`{`
`82`	`82`	`_generator->decodeNextFrame(*_srcFrame);`
`83`	`83`	`}`
`84`		`- // or return an empty frame`
	`84`	`+ // or return NULL`
`85`	`85`	`else`
`86`	`86`	`{`
`87`		`- _dstFrame->clear();`
`88`		`- return _dstFrame;`
	`87`	`+ return NULL;`
`89`	`88`	`}`
`90`	`89`	`}`
`91`	`90`	`// transform`