From 2427c03625fb8affbb9291380da7a8862cea9ee8 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Thu, 21 Nov 2013 13:32:21 +0100 Subject: [PATCH] Wrong example at the visual studio tutorial. Fixed link, fixed sample content and renamed to a more sensible name. Also fixed a wrong link in the actual display_image tutorial. --- .../display_image/display_image.rst | 2 +- .../windows_visual_studio_Opencv.rst | 4 +- .../windows_visual_studio_Opencv/Test.cpp | 206 ------------------ .../introduction_windows_vs.cpp | 30 +++ 4 files changed, 33 insertions(+), 209 deletions(-) delete mode 100644 samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp create mode 100644 samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp diff --git a/doc/tutorials/introduction/display_image/display_image.rst b/doc/tutorials/introduction/display_image/display_image.rst index 303960e5e6..1d2fdc0978 100644 --- a/doc/tutorials/introduction/display_image/display_image.rst +++ b/doc/tutorials/introduction/display_image/display_image.rst @@ -36,7 +36,7 @@ You'll almost always end up using the: + *core* section, as here are defined the basic building blocks of the library + *highgui* module, as this contains the functions for input and output operations -.. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp +.. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp :language: cpp :tab-width: 4 :lines: 1-3 diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst b/doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst index f3058a74d2..3fd734f35d 100644 --- a/doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst +++ b/doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst @@ -142,9 +142,9 @@ The process is the same as described in case of the local approach. Just add the Test it! ======== -Now to try this out download our little test :download:`source code <../../../../samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp>` or get it from the sample code folder of the OpenCV sources. Add this to your project and build it. Here's its content: +Now to try this out download our little test :download:`source code <../../../../samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp>` or get it from the sample code folder of the OpenCV sources. Add this to your project and build it. Here's its content: -.. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp +.. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp :language: cpp :tab-width: 4 :linenos: diff --git a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp b/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp deleted file mode 100644 index 240a2e198c..0000000000 --- a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp +++ /dev/null @@ -1,206 +0,0 @@ -// Video Image PSNR and SSIM -#include // for standard I/O -#include // for strings -#include // for controlling float print precision -#include // string to number conversion - -#include // Gaussian Blur -#include // Basic OpenCV structures (cv::Mat, Scalar) -#include // OpenCV window I/O - -using namespace std; -using namespace cv; - -double getPSNR ( const Mat& I1, const Mat& I2); -Scalar getMSSIM( const Mat& I1, const Mat& I2); - -static void help() -{ - cout - << "\n--------------------------------------------------------------------------" << endl - << "This program shows how to read a video file with OpenCV. In addition, it tests the" - << " similarity of two input videos first with PSNR, and for the frames below a PSNR " << endl - << "trigger value, also with MSSIM."<< endl - << "Usage:" << endl - << "./video-source referenceVideo useCaseTestVideo PSNR_Trigger_Value Wait_Between_Frames " << endl - << "--------------------------------------------------------------------------" << endl - << endl; -} -int main(int argc, char *argv[]) -{ - help(); - if (argc != 5) - { - cout << "Not enough parameters" << endl; - return -1; - } - stringstream conv; - - const string sourceReference = argv[1],sourceCompareWith = argv[2]; - int psnrTriggerValue, delay; - conv << argv[3] << argv[4]; // put in the strings - conv >> psnrTriggerValue >> delay;// take out the numbers - - char c; - int frameNum = -1; // Frame counter - - VideoCapture captRefrnc(sourceReference), - captUndTst(sourceCompareWith); - - if ( !captRefrnc.isOpened()) - { - cout << "Could not open reference " << sourceReference << endl; - return -1; - } - - if( !captUndTst.isOpened()) - { - cout << "Could not open case test " << sourceCompareWith << endl; - return -1; - } - - Size refS = Size((int) captRefrnc.get(CV_CAP_PROP_FRAME_WIDTH), - (int) captRefrnc.get(CV_CAP_PROP_FRAME_HEIGHT)), - uTSi = Size((int) captUndTst.get(CV_CAP_PROP_FRAME_WIDTH), - (int) captUndTst.get(CV_CAP_PROP_FRAME_HEIGHT)); - - if (refS != uTSi) - { - cout << "Inputs have different size!!! Closing." << endl; - return -1; - } - - const char* WIN_UT = "Under Test"; - const char* WIN_RF = "Reference"; - - // Windows - namedWindow(WIN_RF, WINDOW_AUTOSIZE ); - namedWindow(WIN_UT, WINDOW_AUTOSIZE ); - moveWindow(WIN_RF, 400 , 0); //750, 2 (bernat =0) - moveWindow(WIN_UT, refS.width, 0); //1500, 2 - - cout << "Frame resolution: Width=" << refS.width << " Height=" << refS.height - << " of nr#: " << captRefrnc.get(CV_CAP_PROP_FRAME_COUNT) << endl; - - cout << "PSNR trigger value " << - setiosflags(ios::fixed) << setprecision(3) << psnrTriggerValue << endl; - - Mat frameReference, frameUnderTest; - double psnrV; - Scalar mssimV; - - for(;;) //Show the image captured in the window and repeat - { - captRefrnc >> frameReference; - captUndTst >> frameUnderTest; - - if( frameReference.empty() || frameUnderTest.empty()) - { - cout << " < < < Game over! > > > "; - break; - } - - ++frameNum; - cout <<"Frame:" << frameNum; - - ///////////////////////////////// PSNR //////////////////////////////////////////////////// - psnrV = getPSNR(frameReference,frameUnderTest); //get PSNR - cout << setiosflags(ios::fixed) << setprecision(3) << psnrV << "dB"; - - //////////////////////////////////// MSSIM ///////////////////////////////////////////////// - if (psnrV < psnrTriggerValue) - { - mssimV = getMSSIM(frameReference,frameUnderTest); - - cout << " MSSIM: " - << "R" << setiosflags(ios::fixed) << setprecision(3) << mssimV.val[2] * 100 - << "G" << setiosflags(ios::fixed) << setprecision(3) << mssimV.val[1] * 100 - << "B" << setiosflags(ios::fixed) << setprecision(3) << mssimV.val[0] * 100; - } - - cout << endl; - - ////////////////////////////////// Show Image ///////////////////////////////////////////// - imshow( WIN_RF, frameReference); - imshow( WIN_UT, frameUnderTest); - - c = (char)waitKey(delay); - if (c == 27) break; - } - - return 0; -} - -double getPSNR(const Mat& I1, const Mat& I2) -{ - Mat s1; - absdiff(I1, I2, s1); // |I1 - I2| - s1.convertTo(s1, CV_32F); // cannot make a square on 8 bits - s1 = s1.mul(s1); // |I1 - I2|^2 - - Scalar s = sum(s1); // sum elements per channel - - double sse = s.val[0] + s.val[1] + s.val[2]; // sum channels - - if( sse <= 1e-10) // for small values return zero - return 0; - else - { - double mse =sse /(double)(I1.channels() * I1.total()); - double psnr = 10.0*log10((255*255)/mse); - return psnr; - } -} - -Scalar getMSSIM( const Mat& i1, const Mat& i2) -{ - const double C1 = 6.5025, C2 = 58.5225; - /***************************** INITS **********************************/ - int d = CV_32F; - - Mat I1, I2; - i1.convertTo(I1, d); // cannot calculate on one byte large values - i2.convertTo(I2, d); - - Mat I2_2 = I2.mul(I2); // I2^2 - Mat I1_2 = I1.mul(I1); // I1^2 - Mat I1_I2 = I1.mul(I2); // I1 * I2 - - /*************************** END INITS **********************************/ - - Mat mu1, mu2; // PRELIMINARY COMPUTING - GaussianBlur(I1, mu1, Size(11, 11), 1.5); - GaussianBlur(I2, mu2, Size(11, 11), 1.5); - - Mat mu1_2 = mu1.mul(mu1); - Mat mu2_2 = mu2.mul(mu2); - Mat mu1_mu2 = mu1.mul(mu2); - - Mat sigma1_2, sigma2_2, sigma12; - - GaussianBlur(I1_2, sigma1_2, Size(11, 11), 1.5); - sigma1_2 -= mu1_2; - - GaussianBlur(I2_2, sigma2_2, Size(11, 11), 1.5); - sigma2_2 -= mu2_2; - - GaussianBlur(I1_I2, sigma12, Size(11, 11), 1.5); - sigma12 -= mu1_mu2; - - ///////////////////////////////// FORMULA //////////////////////////////// - Mat t1, t2, t3; - - t1 = 2 * mu1_mu2 + C1; - t2 = 2 * sigma12 + C2; - t3 = t1.mul(t2); // t3 = ((2*mu1_mu2 + C1).*(2*sigma12 + C2)) - - t1 = mu1_2 + mu2_2 + C1; - t2 = sigma1_2 + sigma2_2 + C2; - t1 = t1.mul(t2); // t1 =((mu1_2 + mu2_2 + C1).*(sigma1_2 + sigma2_2 + C2)) - - Mat ssim_map; - divide(t3, t1, ssim_map); // ssim_map = t3./t1; - - Scalar mssim = mean( ssim_map ); // mssim = average of ssim map - return mssim; -} diff --git a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp b/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp new file mode 100644 index 0000000000..5339c9a948 --- /dev/null +++ b/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp @@ -0,0 +1,30 @@ +#include +#include +#include + +using namespace cv; +using namespace std; + +int main( int argc, char** argv ) +{ + if( argc != 2) + { + cout <<" Usage: display_image ImageToLoadAndDisplay" << endl; + return -1; + } + + Mat image; + image = imread(argv[1], IMREAD_COLOR); // Read the file + + if(! image.data ) // Check for invalid input + { + cout << "Could not open or find the image" << std::endl ; + return -1; + } + + namedWindow( "Display window", WINDOW_AUTOSIZE ); // Create a window for display. + imshow( "Display window", image ); // Show our image inside it. + + waitKey(0); // Wait for a keystroke in the window + return 0; +} \ No newline at end of file