filters: refactor how to allocate/free the objects

Clement Champetier · Clement Champetier · commit 9203a714f94e · 2016-10-28T17:17:57.000+02:00
diff --git a/src/AvTranscoder/filter/Filter.hpp b/src/AvTranscoder/filter/Filter.hpp
@@ -30,8 +30,8 @@ class AvExport Filter
 #endif
 
 private:
-    AVFilter* _filter;
-    AVFilterContext* _context;
+    AVFilter* _filter;  ///< Has ownership
+    AVFilterContext* _context;  ///< Has link (no ownership)
     std::string _options;
     std::string _instanceName;
 };
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -30,7 +30,7 @@ FilterGraph::~FilterGraph()
 {
     for(std::vector<Filter*>::iterator it = _filters.begin(); it < _filters.end(); ++it)
     {
-        it = _filters.erase(it);
+        delete(*it);
     }
     avfilter_graph_free(&_graph);
 }
@@ -168,9 +168,8 @@ void FilterGraph::addInBuffer(const std::vector<IFrame*>& inputs)
             throw std::runtime_error("Cannot create input buffer of filter graph: the given frame is invalid.");
 
         // add in buffer
-        Filter* in = new Filter(filterName, filterOptions.str(), "in");
         LOG_INFO("Add filter '" << filterName << "' at the beginning of the graph.")
-        _filters.insert(_filters.begin(), in);
+        _filters.insert(_filters.begin(), new Filter(filterName, filterOptions.str(), "in"));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ FilterGraph::~FilterGraph()`
`30`	`30`	`{`
`31`	`31`	`for(std::vector<Filter*>::iterator it = _filters.begin(); it < _filters.end(); ++it)`
`32`	`32`	`{`
`33`		`- it = _filters.erase(it);`
	`33`	`+ delete(*it);`
`34`	`34`	`}`
`35`	`35`	`avfilter_graph_free(&_graph);`
`36`	`36`	`}`
`@@ -168,9 +168,8 @@ void FilterGraph::addInBuffer(const std::vector<IFrame*>& inputs)`
`168`	`168`	`throw std::runtime_error("Cannot create input buffer of filter graph: the given frame is invalid.");`
`169`	`169`
`170`	`170`	`// add in buffer`
`171`		`- Filter* in = new Filter(filterName, filterOptions.str(), "in");`
`172`	`171`	`LOG_INFO("Add filter '" << filterName << "' at the beginning of the graph.")`
`173`		`- _filters.insert(_filters.begin(), in);`
	`172`	`+ _filters.insert(_filters.begin(), new Filter(filterName, filterOptions.str(), "in"));`
`174`	`173`	`}`
`175`	`174`	`}`
`176`	`175`