From: Roman Donchenko Date: Fri, 25 Oct 2013 10:37:54 +0000 (+0400) Subject: Fixed indentation in CV_FFmpegWriteBigVideoTest::run. X-Git-Tag: accepted/tizen/ivi/20140515.103456~1^2~342^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1188894133a59f16a31b98e4115faf06f0d50772;p=profile%2Fivi%2Fopencv.git Fixed indentation in CV_FFmpegWriteBigVideoTest::run. --- diff --git a/modules/highgui/test/test_ffmpeg.cpp b/modules/highgui/test/test_ffmpeg.cpp index 9ef415b..468fe77 100644 --- a/modules/highgui/test/test_ffmpeg.cpp +++ b/modules/highgui/test/test_ffmpeg.cpp @@ -84,64 +84,63 @@ public: for (size_t j = 0; j < n; ++j) { - int tag = tags[j]; - stringstream s; - s << tag; + int tag = tags[j]; + stringstream s; + s << tag; - const string filename = "output_"+s.str()+".avi"; + const string filename = "output_"+s.str()+".avi"; - try - { - double fps = fps0; - Size frame_s = Size(img_c, img_r); - - if( tag == CV_FOURCC('H', '2', '6', '1') ) - frame_s = Size(352, 288); - else if( tag == CV_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') ) + try { - frame_s = Size(720, 576); - fps = 25; - } - - VideoWriter writer(filename, tag, fps, frame_s); + double fps = fps0; + Size frame_s = Size(img_c, img_r); + + if( tag == CV_FOURCC('H', '2', '6', '1') ) + frame_s = Size(352, 288); + else if( tag == CV_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') ) + { + frame_s = Size(720, 576); + fps = 25; + } - if (writer.isOpened() == false) - { - ts->printf(ts->LOG, "\n\nFile name: %s\n", filename.c_str()); - ts->printf(ts->LOG, "Codec id: %d Codec tag: %c%c%c%c\n", j, - tag & 255, (tag >> 8) & 255, (tag >> 16) & 255, (tag >> 24) & 255); - ts->printf(ts->LOG, "Error: cannot create video file."); - ts->set_failed_test_info(ts->FAIL_INVALID_OUTPUT); - } - else - { - Mat img(frame_s, CV_8UC3, Scalar::all(0)); - const int coeff = cvRound(min(frame_s.width, frame_s.height)/(fps0 * time_sec)); + VideoWriter writer(filename, tag, fps, frame_s); - for (int i = 0 ; i < static_cast(fps * time_sec); i++ ) + if (writer.isOpened() == false) { - //circle(img, Point2i(img_c / 2, img_r / 2), min(img_r, img_c) / 2 * (i + 1), Scalar(255, 0, 0, 0), 2); - rectangle(img, Point2i(coeff * i, coeff * i), Point2i(coeff * (i + 1), coeff * (i + 1)), - Scalar::all(255 * (1.0 - static_cast(i) / (fps * time_sec * 2) )), -1); - writer << img; + ts->printf(ts->LOG, "\n\nFile name: %s\n", filename.c_str()); + ts->printf(ts->LOG, "Codec id: %d Codec tag: %c%c%c%c\n", j, + tag & 255, (tag >> 8) & 255, (tag >> 16) & 255, (tag >> 24) & 255); + ts->printf(ts->LOG, "Error: cannot create video file."); + ts->set_failed_test_info(ts->FAIL_INVALID_OUTPUT); + } + else + { + Mat img(frame_s, CV_8UC3, Scalar::all(0)); + const int coeff = cvRound(min(frame_s.width, frame_s.height)/(fps0 * time_sec)); + + for (int i = 0 ; i < static_cast(fps * time_sec); i++ ) + { + //circle(img, Point2i(img_c / 2, img_r / 2), min(img_r, img_c) / 2 * (i + 1), Scalar(255, 0, 0, 0), 2); + rectangle(img, Point2i(coeff * i, coeff * i), Point2i(coeff * (i + 1), coeff * (i + 1)), + Scalar::all(255 * (1.0 - static_cast(i) / (fps * time_sec * 2) )), -1); + writer << img; + } + + if (!created) created = true; + else remove(filename.c_str()); } - - if (!created) created = true; - else remove(filename.c_str()); } - } - catch(...) - { - ts->set_failed_test_info(ts->FAIL_INVALID_OUTPUT); - } - ts->set_failed_test_info(cvtest::TS::OK); - + catch(...) + { + ts->set_failed_test_info(ts->FAIL_INVALID_OUTPUT); + } + ts->set_failed_test_info(cvtest::TS::OK); } } };