mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.

Browse Source 
(cherry picked from commit 3f3ae33327)
This commit is contained in:
Roman Donchenko 2013-10-25 14:29:05 +04:00
parent d3af86c0ea
commit 260c2e0b08
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/highgui/test/test_ffmpeg.cpp
View File

@ -47,8 +47,6 @@ using namespace cv;
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#include "ffmpeg_codecs.hpp"
using namespace std; using namespace std;
class CV_FFmpegWriteBigVideoTest : public cvtest::BaseTest class CV_FFmpegWriteBigVideoTest : public cvtest::BaseTest
@ -61,32 +59,34 @@ public:
const double fps0 = 15; const double fps0 = 15;
const double time_sec = 1; const double time_sec = 1;
const size_t n = sizeof(codec_bmp_tags)/sizeof(codec_bmp_tags[0]); 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'),
};
const size_t n = sizeof(tags)/sizeof(tags[0]);
bool created = false; bool created = false;
for (size_t j = 0; j < n; ++j) for (size_t j = 0; j < n; ++j)
{ {
stringstream s; s << codec_bmp_tags[j].tag; int tag = tags[j];
int tag = codec_bmp_tags[j].tag; stringstream s;
s << tag;
if( tag != MKTAG('H', '2', '6', '3') &&
tag != MKTAG('H', '2', '6', '1') &&
//tag != MKTAG('D', 'I', 'V', 'X') &&
tag != MKTAG('D', 'X', '5', '0') &&
tag != MKTAG('X', 'V', 'I', 'D') &&
tag != MKTAG('m', 'p', '4', 'v') &&
//tag != MKTAG('D', 'I', 'V', '3') &&
//tag != MKTAG('W', 'M', 'V', '1') &&
//tag != MKTAG('W', 'M', 'V', '2') &&
tag != MKTAG('M', 'P', 'E', 'G') &&
tag != MKTAG('M', 'J', 'P', 'G') &&
//tag != MKTAG('j', 'p', 'e', 'g') &&
tag != 0 &&
tag != MKTAG('I', '4', '2', '0') &&
//tag != MKTAG('Y', 'U', 'Y', '2') &&
tag != MKTAG('F', 'L', 'V', '1') )
continue;
const string filename = "output_"+s.str()+".avi"; const string filename = "output_"+s.str()+".avi";