Skip to content

O
opencv
Commit 11888941 authored by Roman Donchenko's avatar Roman Donchenko
Browse files
Options

Fixed indentation in CV_FFmpegWriteBigVideoTest::run.

parent 2ca49eef
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 50 deletions
modules/highgui/test/test_ffmpeg.cpp
View file @ 11888941
...@@ -84,64 +84,63 @@ public: ...@@ -84,64 +84,63 @@ public:
for (size_t j = 0; j < n; ++j) for (size_t j = 0; j < n; ++j)
{ {
int tag = tags[j]; int tag = tags[j];
stringstream s; stringstream s;
s << tag; s << tag;
const string filename = "output_"+s.str()+".avi"; const string filename = "output_"+s.str()+".avi";
try 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') )
{ {
frame_s = Size(720, 576); double fps = fps0;
fps = 25; Size frame_s = Size(img_c, img_r);
}
if( tag == CV_FOURCC('H', '2', '6', '1') )
VideoWriter writer(filename, tag, fps, frame_s); 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) VideoWriter writer(filename, tag, fps, frame_s);
{
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<int>(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); ts->printf(ts->LOG, "\n\nFile name: %s\n", filename.c_str());
rectangle(img, Point2i(coeff * i, coeff * i), Point2i(coeff * (i + 1), coeff * (i + 1)), ts->printf(ts->LOG, "Codec id: %d Codec tag: %c%c%c%c\n", j,
Scalar::all(255 * (1.0 - static_cast<double>(i) / (fps * time_sec * 2) )), -1); tag & 255, (tag >> 8) & 255, (tag >> 16) & 255, (tag >> 24) & 255);
writer << img; 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<int>(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<double>(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(...)
catch(...) {
{ ts->set_failed_test_info(ts->FAIL_INVALID_OUTPUT);
ts->set_failed_test_info(ts->FAIL_INVALID_OUTPUT); }
} ts->set_failed_test_info(cvtest::TS::OK);
ts->set_failed_test_info(cvtest::TS::OK);
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment