Merge pull request opencv#8984 from alalek:update_videowriter_apipreference

mshabunin · mshabunin · commit c60b7d76c58f · 2017-06-26T09:18:33.000Z
diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp
@@ -855,7 +855,7 @@ class CV_EXPORTS_W VideoWriter
     The `apiPreference` parameter allows to specify API backends to use. Can be used to enforce a specific reader implementation
     if multiple are available: e.g. cv::CAP_FFMPEG or cv::CAP_GSTREAMER.
      */
-    CV_WRAP VideoWriter(int apiPreference, const String& filename, int fourcc, double fps,
+    CV_WRAP VideoWriter(const String& filename, int apiPreference, int fourcc, double fps,
                 Size frameSize, bool isColor = true);
 
     /** @brief Default destructor
@@ -875,15 +875,9 @@ class CV_EXPORTS_W VideoWriter
     CV_WRAP virtual bool open(const String& filename, int fourcc, double fps,
                       Size frameSize, bool isColor = true);
 
-    /** @brief Initializes or reinitializes video writer.
-
-    The method opens video writer. Parameters are the same as in the constructor
-    VideoWriter::VideoWriter.
-    @return `true` if video writer has been successfully initialized
-
-    The method first calls VideoWriter::release to close the already opened file.
+    /** @overload
      */
-    CV_WRAP bool open(int apiPreference, const String& filename, int fourcc, double fps,
+    CV_WRAP bool open(const String& filename, int apiPreference, int fourcc, double fps,
                       Size frameSize, bool isColor = true);
 
     /** @brief Returns true if video writer has been successfully initialized.
diff --git a/modules/videoio/src/cap.cpp b/modules/videoio/src/cap.cpp
@@ -368,13 +368,7 @@ CV_IMPL CvCapture * cvCreateFileCapture (const char * filename)
  * Videowriter dispatching method: it tries to find the first
  * API that can write a given stream.
  */
-CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,
-                                            double fps, CvSize frameSize, int is_color )
-{
-    return cvCreateVideoWriterWithPreference(CV_CAP_ANY, filename, fourcc, fps, frameSize, is_color);
-}
-
-CvVideoWriter* cvCreateVideoWriterWithPreference(int apiPreference, const char* filename, int fourcc,
+static CvVideoWriter* cvCreateVideoWriterWithPreference(const char* filename, int apiPreference, int fourcc,
                                             double fps, CvSize frameSize, int is_color )
 {
     CV_UNUSED(frameSize);
@@ -428,6 +422,12 @@ CvVideoWriter* cvCreateVideoWriterWithPreference(int apiPreference, const char*
     return result;
 }
 
+CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,
+                                            double fps, CvSize frameSize, int is_color )
+{
+    return cvCreateVideoWriterWithPreference(filename, CV_CAP_ANY, fourcc, fps, frameSize, is_color);
+}
+
 CV_IMPL int cvWriteFrame( CvVideoWriter* writer, const IplImage* image )
 {
     return writer ? writer->writeFrame(image) : 0;
@@ -563,7 +563,7 @@ static Ptr<IVideoCapture> IVideoCapture_create(const String& filename)
     return Ptr<IVideoCapture>();
 }
 
-static Ptr<IVideoWriter> IVideoWriter_create(int apiPreference, const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)
+static Ptr<IVideoWriter> IVideoWriter_create(const String& filename, int apiPreference, int _fourcc, double fps, Size frameSize, bool isColor)
 {
     Ptr<IVideoWriter> iwriter;
 #ifdef HAVE_MFX
@@ -757,9 +757,9 @@ VideoWriter::VideoWriter(const String& filename, int _fourcc, double fps, Size f
 }
 
 
-VideoWriter::VideoWriter(int apiPreference, const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)
+VideoWriter::VideoWriter(const String& filename, int apiPreference, int _fourcc, double fps, Size frameSize, bool isColor)
 {
-    open(apiPreference, filename, _fourcc, fps, frameSize, isColor);
+    open(filename, apiPreference, _fourcc, fps, frameSize, isColor);
 }
 
 void VideoWriter::release()
@@ -775,18 +775,18 @@ VideoWriter::~VideoWriter()
 
 bool VideoWriter::open(const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)
 {
-    return open(CAP_ANY, filename, _fourcc, fps, frameSize, isColor);
+    return open(filename, CAP_ANY, _fourcc, fps, frameSize, isColor);
 }
 
-bool VideoWriter::open(int apiPreference, const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)
+bool VideoWriter::open(const String& filename, int apiPreference, int _fourcc, double fps, Size frameSize, bool isColor)
 {
     CV_INSTRUMENT_REGION()
 
     if (isOpened()) release();
-    iwriter = IVideoWriter_create(apiPreference, filename, _fourcc, fps, frameSize, isColor);
+    iwriter = IVideoWriter_create(filename, apiPreference, _fourcc, fps, frameSize, isColor);
     if (!iwriter.empty())
         return true;
-    writer.reset(cvCreateVideoWriterWithPreference(apiPreference, filename.c_str(), _fourcc, fps, frameSize, isColor));
+    writer.reset(cvCreateVideoWriterWithPreference(filename.c_str(), apiPreference, _fourcc, fps, frameSize, isColor));
     return isOpened();
 }
 
diff --git a/modules/videoio/src/precomp.hpp b/modules/videoio/src/precomp.hpp
@@ -162,9 +162,6 @@ CvCapture * cvCreateCameraCapture_Unicap  (const int     index);
 CvCapture * cvCreateCameraCapture_PvAPI  (const int     index);
 CvVideoWriter* cvCreateVideoWriter_GStreamer( const char* filename, int fourcc,
                                             double fps, CvSize frameSize, int is_color );
-CvVideoWriter* cvCreateVideoWriterWithPreference(int api, const char* filename, int fourcc,
-                                           double fps, CvSize frame_size,
-                                           int is_color CV_DEFAULT(1));
 
 
 namespace cv

Original file line number	Diff line number	Diff line change
`@@ -368,13 +368,7 @@ CV_IMPL CvCapture * cvCreateFileCapture (const char * filename)`
`368`	`368`	`* Videowriter dispatching method: it tries to find the first`
`369`	`369`	`* API that can write a given stream.`
`370`	`370`	`*/`
`371`		`-CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,`
`372`		`- double fps, CvSize frameSize, int is_color )`
`373`		`-{`
`374`		`- return cvCreateVideoWriterWithPreference(CV_CAP_ANY, filename, fourcc, fps, frameSize, is_color);`
`375`		`-}`
`376`		`-`
`377`		`-CvVideoWriter* cvCreateVideoWriterWithPreference(int apiPreference, const char* filename, int fourcc,`
	`371`	`+static CvVideoWriter* cvCreateVideoWriterWithPreference(const char* filename, int apiPreference, int fourcc,`
`378`	`372`	`double fps, CvSize frameSize, int is_color )`
`379`	`373`	`{`
`380`	`374`	`CV_UNUSED(frameSize);`
`@@ -428,6 +422,12 @@ CvVideoWriter* cvCreateVideoWriterWithPreference(int apiPreference, const char*`
`428`	`422`	`return result;`
`429`	`423`	`}`
`430`	`424`
	`425`	`+CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,`
	`426`	`+ double fps, CvSize frameSize, int is_color )`
	`427`	`+{`
	`428`	`+ return cvCreateVideoWriterWithPreference(filename, CV_CAP_ANY, fourcc, fps, frameSize, is_color);`
	`429`	`+}`
	`430`	`+`
`431`	`431`	`CV_IMPL int cvWriteFrame( CvVideoWriter* writer, const IplImage* image )`
`432`	`432`	`{`
`433`	`433`	`return writer ? writer->writeFrame(image) : 0;`
`@@ -563,7 +563,7 @@ static Ptr<IVideoCapture> IVideoCapture_create(const String& filename)`
`563`	`563`	`return Ptr<IVideoCapture>();`
`564`	`564`	`}`
`565`	`565`
`566`		`-static Ptr<IVideoWriter> IVideoWriter_create(int apiPreference, const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)`
	`566`	`+static Ptr<IVideoWriter> IVideoWriter_create(const String& filename, int apiPreference, int _fourcc, double fps, Size frameSize, bool isColor)`
`567`	`567`	`{`
`568`	`568`	`Ptr<IVideoWriter> iwriter;`
`569`	`569`	`#ifdef HAVE_MFX`
`@@ -757,9 +757,9 @@ VideoWriter::VideoWriter(const String& filename, int _fourcc, double fps, Size f`
`757`	`757`	`}`
`758`	`758`
`759`	`759`
`760`		`-VideoWriter::VideoWriter(int apiPreference, const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)`
	`760`	`+VideoWriter::VideoWriter(const String& filename, int apiPreference, int _fourcc, double fps, Size frameSize, bool isColor)`
`761`	`761`	`{`
`762`		`- open(apiPreference, filename, _fourcc, fps, frameSize, isColor);`
	`762`	`+ open(filename, apiPreference, _fourcc, fps, frameSize, isColor);`
`763`	`763`	`}`
`764`	`764`
`765`	`765`	`void VideoWriter::release()`
`@@ -775,18 +775,18 @@ VideoWriter::~VideoWriter()`
`775`	`775`
`776`	`776`	`bool VideoWriter::open(const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)`
`777`	`777`	`{`
`778`		`- return open(CAP_ANY, filename, _fourcc, fps, frameSize, isColor);`
	`778`	`+ return open(filename, CAP_ANY, _fourcc, fps, frameSize, isColor);`
`779`	`779`	`}`
`780`	`780`
`781`		`-bool VideoWriter::open(int apiPreference, const String& filename, int _fourcc, double fps, Size frameSize, bool isColor)`
	`781`	`+bool VideoWriter::open(const String& filename, int apiPreference, int _fourcc, double fps, Size frameSize, bool isColor)`
`782`	`782`	`{`
`783`	`783`	`CV_INSTRUMENT_REGION()`
`784`	`784`
`785`	`785`	`if (isOpened()) release();`
`786`		`- iwriter = IVideoWriter_create(apiPreference, filename, _fourcc, fps, frameSize, isColor);`
	`786`	`+ iwriter = IVideoWriter_create(filename, apiPreference, _fourcc, fps, frameSize, isColor);`
`787`	`787`	`if (!iwriter.empty())`
`788`	`788`	`return true;`
`789`		`- writer.reset(cvCreateVideoWriterWithPreference(apiPreference, filename.c_str(), _fourcc, fps, frameSize, isColor));`
	`789`	`+ writer.reset(cvCreateVideoWriterWithPreference(filename.c_str(), apiPreference, _fourcc, fps, frameSize, isColor));`
`790`	`790`	`return isOpened();`
`791`	`791`	`}`
`792`	`792`