Merge remote-tracking branch 'origin/2.4' into merge-2.4

[profile/ivi/opencv.git] / modules / highgui / test / test_ffmpeg.cpp

diff --git a/modules/highgui/test/test_ffmpeg.cpp b/modules/highgui/test/test_ffmpeg.cpp
index 30410ea..727971e 100644 (file)
--- a/modules/highgui/test/test_ffmpeg.cpp
+++ b/modules/highgui/test/test_ffmpeg.cpp
@@ -41,7 +41,7 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 
 using namespace cv;
 
@@ -61,21 +61,21 @@ public:
 
         const int tags[] = {
             0,
-            //CV_FOURCC('D', 'I', 'V', '3'),
-            //CV_FOURCC('D', 'I', 'V', 'X'),
-            CV_FOURCC('D', 'X', '5', '0'),
-            CV_FOURCC('F', 'L', 'V', '1'),
-            CV_FOURCC('H', '2', '6', '1'),
-            CV_FOURCC('H', '2', '6', '3'),
-            CV_FOURCC('I', '4', '2', '0'),
-            //CV_FOURCC('j', 'p', 'e', 'g'),
-            CV_FOURCC('M', 'J', 'P', 'G'),
-            CV_FOURCC('m', 'p', '4', 'v'),
-            CV_FOURCC('M', 'P', 'E', 'G'),
-            //CV_FOURCC('W', 'M', 'V', '1'),
-            //CV_FOURCC('W', 'M', 'V', '2'),
-            CV_FOURCC('X', 'V', 'I', 'D'),
-            //CV_FOURCC('Y', 'U', 'Y', '2'),
+            //VideoWriter::fourcc('D', 'I', 'V', '3'),
+            //VideoWriter::fourcc('D', 'I', 'V', 'X'),
+            VideoWriter::fourcc('D', 'X', '5', '0'),
+            VideoWriter::fourcc('F', 'L', 'V', '1'),
+            VideoWriter::fourcc('H', '2', '6', '1'),
+            VideoWriter::fourcc('H', '2', '6', '3'),
+            VideoWriter::fourcc('I', '4', '2', '0'),
+            //VideoWriter::fourcc('j', 'p', 'e', 'g'),
+            VideoWriter::fourcc('M', 'J', 'P', 'G'),
+            VideoWriter::fourcc('m', 'p', '4', 'v'),
+            VideoWriter::fourcc('M', 'P', 'E', 'G'),
+            //VideoWriter::fourcc('W', 'M', 'V', '1'),
+            //VideoWriter::fourcc('W', 'M', 'V', '2'),
+            VideoWriter::fourcc('X', 'V', 'I', 'D'),
+            //VideoWriter::fourcc('Y', 'U', 'Y', '2'),
         };
 
         const size_t n = sizeof(tags)/sizeof(tags[0]);
@@ -95,15 +95,15 @@ public:
                 double fps = fps0;
                 Size frame_s = Size(img_c, img_r);
 
-                if( tag == CV_FOURCC('H', '2', '6', '1') )
+                if( tag == VideoWriter::fourcc('H', '2', '6', '1') )
                     frame_s = Size(352, 288);
-                else if( tag == CV_FOURCC('H', '2', '6', '3') )
+                else if( tag == VideoWriter::fourcc('H', '2', '6', '3') )
                     frame_s = Size(704, 576);
                 /*else if( tag == CV_FOURCC('M', 'J', 'P', 'G') ||
                          tag == CV_FOURCC('j', 'p', 'e', 'g') )
                     frame_s = Size(1920, 1080);*/
 
-                if( tag == CV_FOURCC('M', 'P', 'E', 'G') )
+                if( tag == VideoWriter::fourcc('M', 'P', 'E', 'G') )
                 {
                     frame_s = Size(720, 576);
                     fps = 25;
@@ -203,7 +203,7 @@ public:
             std::string fileName = tempfile(stream.str().c_str());
 
             files->operator[](i) = fileName;
-            writers->operator[](i) = new VideoWriter(fileName, CV_FOURCC('X','V','I','D'), 25.0f, FrameSize);
+            writers->operator[](i) = new VideoWriter(fileName, VideoWriter::fourcc('X','V','I','D'), 25.0f, FrameSize);
 
             CV_Assert(writers->operator[](i)->isOpened());
         }
@@ -313,7 +313,7 @@ public:
             CV_Assert(capture->isOpened());
 
             const static double eps = 23.0;
-            unsigned int frameCount = static_cast<unsigned int>(capture->get(CV_CAP_PROP_FRAME_COUNT));
+            unsigned int frameCount = static_cast<unsigned int>(capture->get(CAP_PROP_FRAME_COUNT));
             CV_Assert(frameCount == WriteVideo_Invoker::FrameCount);
             Mat reference(CreateVideoWriterInvoker::FrameSize, CV_8UC3);