Fix device opening
This commit is contained in:
1 parent
7919d2a3f2
commit
f43a21d810
4 files changed
+20
-12
No files matched your search
+11
-8
@@ -262,14 +262,17 @@ Void PlaYUVerApp::open()
|
||||
|
||||
for( UInt i = 0; i < supportedFmts.size(); i++ )
|
||||
{
|
||||
QString currFmt;
|
||||
supported.append( " *." );
|
||||
supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
|
||||
currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
|
||||
currFmt.append( " (*." );
|
||||
currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
|
||||
currFmt.append( ")" );
|
||||
formatsList << currFmt;
|
||||
if( supportedFmts[i].formatExt != "" )
|
||||
{
|
||||
QString currFmt;
|
||||
supported.append( " *." );
|
||||
supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
|
||||
currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
|
||||
currFmt.append( " (*." );
|
||||
currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
|
||||
currFmt.append( ")" );
|
||||
formatsList << currFmt;
|
||||
}
|
||||
}
|
||||
supported.append( " )" );
|
||||
|
||||
|
||||
@@ -45,9 +45,9 @@
|
||||
std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedReadFormats()
|
||||
{
|
||||
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Video", "yuv" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Video", "gray" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Video", "rgb" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw YUV Video", "yuv" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw Gray Video", "gray" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerRaw::Create, "Raw RGB Video", "rgb" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable BitMap ", "pbm" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable GrayMap ", "pgm" );
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerPortableMap::Create, "Portable PixMap ", "ppm" );
|
||||
|
||||
@@ -43,6 +43,7 @@ typedef struct
|
||||
{
|
||||
String formatName;
|
||||
String formatExt;
|
||||
String formatPattern;
|
||||
CreateStreamHandlerFn formatFct;
|
||||
} PlaYUVerSupportedFormat;
|
||||
|
||||
@@ -58,6 +59,10 @@ typedef struct
|
||||
formatElem.formatFct = handler; \
|
||||
formatsList.push_back( formatElem );
|
||||
|
||||
#define REGIST_PLAYUVER_SUPPORTED_ABSTRACT_FMT( handler, name, pattern ) \
|
||||
formatElem.formatPattern = pattern; \
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( handler, name, "" )
|
||||
|
||||
#define APPEND_PLAYUVER_SUPPORTED_FMT( class_name, fct ) \
|
||||
{ \
|
||||
std::vector<PlaYUVerSupportedFormat> new_fmts = class_name::supported##fct##Formats(); \
|
||||
|
||||
@@ -41,7 +41,7 @@ std::vector<PlaYUVerSupportedFormat> StreamHandlerOpenCV::supportedReadFormats()
|
||||
{
|
||||
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
|
||||
#if( CV_MAJOR_VERSION >= 3 )
|
||||
REGIST_PLAYUVER_SUPPORTED_FMT( &StreamHandlerOpenCV::Create, "Device", "/dev/" );
|
||||
REGIST_PLAYUVER_SUPPORTED_ABSTRACT_FMT( &StreamHandlerOpenCV::Create, "Device", "/dev/video*" );
|
||||
#endif
|
||||
END_REGIST_PLAYUVER_SUPPORTED_FMT;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user