Frame: rename clear method to unrefFrame

Clement Champetier · Clement Champetier · commit 58cfca0dad08 · 2016-10-26T12:37:22.000+02:00
Symmetry with refFrame.
diff --git a/src/AvTranscoder/data/decoded/Frame.cpp b/src/AvTranscoder/data/decoded/Frame.cpp
@@ -82,7 +82,7 @@ void Frame::refFrame(const Frame& otherFrame)
     }
 }
 
-void Frame::clear()
+void Frame::unrefFrame()
 {
     av_frame_unref(_frame);
 }
diff --git a/src/AvTranscoder/data/decoded/Frame.hpp b/src/AvTranscoder/data/decoded/Frame.hpp
@@ -79,7 +79,7 @@ class AvExport Frame
     /**
      * @brief Unreference all the buffers referenced by frame and reset the frame fields.
      */
-    void clear();
+    void unrefFrame();
 
     /**
      * @return If it corresponds to a valid audio frame.
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -25,7 +25,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
     if(! frameBuffer.isAudioFrame())
     {
         LOG_WARN("The given frame to put data is not a valid audio frame: try to reallocate it.")
-        frameBuffer.clear();
+        frameBuffer.unrefFrame();
         static_cast<AudioFrame&>(frameBuffer).allocateAVSample(_frameDesc);
     }
 
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -25,7 +25,7 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)
     if(! frameBuffer.isVideoFrame())
     {
         LOG_WARN("The given frame to put data is not a valid video frame: try to reallocate it.")
-        frameBuffer.clear();
+        frameBuffer.unrefFrame();
         static_cast<VideoFrame&>(frameBuffer).allocateAVPicture(_frameDesc);
     }
 
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -40,7 +40,7 @@ void FilterGraph::process(const std::vector<Frame*>& inputs, Frame& output)
     if(!hasFilters())
     {
         LOG_DEBUG("No filter to process: reference first input frame to the given output.")
-        output.clear();
+        output.unrefFrame();
         output.refFrame(*inputs.at(0));
         return;
     }
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -550,7 +550,7 @@ bool StreamTranscoder::processTranscode()
         LOG_DEBUG("Convert")
         _transform->convert(*_filteredData, *_transformedData);
 
-        _filteredData->clear();
+        _filteredData->unrefFrame();
 
         LOG_DEBUG("Encode")
         _outputEncoder->encodeFrame(*_transformedData, data);

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void Frame::refFrame(const Frame& otherFrame)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`-void Frame::clear()`
	`85`	`+void Frame::unrefFrame()`
`86`	`86`	`{`
`87`	`87`	`av_frame_unref(_frame);`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)`
`25`	`25`	`if(! frameBuffer.isAudioFrame())`
`26`	`26`	`{`
`27`	`27`	`LOG_WARN("The given frame to put data is not a valid audio frame: try to reallocate it.")`
`28`		`- frameBuffer.clear();`
	`28`	`+ frameBuffer.unrefFrame();`
`29`	`29`	`static_cast<AudioFrame&>(frameBuffer).allocateAVSample(_frameDesc);`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)`
`25`	`25`	`if(! frameBuffer.isVideoFrame())`
`26`	`26`	`{`
`27`	`27`	`LOG_WARN("The given frame to put data is not a valid video frame: try to reallocate it.")`
`28`		`- frameBuffer.clear();`
	`28`	`+ frameBuffer.unrefFrame();`
`29`	`29`	`static_cast<VideoFrame&>(frameBuffer).allocateAVPicture(_frameDesc);`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void FilterGraph::process(const std::vector<Frame*>& inputs, Frame& output)`
`40`	`40`	`if(!hasFilters())`
`41`	`41`	`{`
`42`	`42`	`LOG_DEBUG("No filter to process: reference first input frame to the given output.")`
`43`		`- output.clear();`
	`43`	`+ output.unrefFrame();`
`44`	`44`	`output.refFrame(*inputs.at(0));`
`45`	`45`	`return;`
`46`	`46`	`}`