Change the functions to handle supported formats

This commit is contained in:
jfmcarreira committed 2015-07-28 23:50:29 +01:00
1 parent 30a4819499
commit c6e5c906e8
8 files changed
+115 -168

No files matched your search

+5 -6
View File
@@ -470,17 +470,16 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf )
QString supported = tr( "Supported Files (" );
QStringList formatsList;
std::vector<std::string> formatsExt = PlaYUVerStream::supportedWriteFormatsExt();
std::vector<std::string> formatsName = PlaYUVerStream::supportedWriteFormatsName();
for( UInt i = 0; i < formatsName.size(); i++ )
std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedWriteFormats();
for( UInt i = 0; i < supportedFmts.size(); i++ )
{
QString currFmt;
supported.append( " *." );
supported.append( QString::fromStdString( formatsExt[i] ) );
currFmt.append( QString::fromStdString( formatsName[i] ) );
supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
currFmt.append( " (*." );
currFmt.append( QString::fromStdString( formatsExt[i] ) );
currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
currFmt.append( ")" );
formatsList << currFmt;
}
+10 -12
View File
@@ -259,17 +259,16 @@ Void PlaYUVerApp::open()
{
QString supported = tr( "Supported Files (" );
QStringList formatsList;
std::vector<std::string> formatsExt = PlaYUVerStream::supportedReadFormatsExt();
std::vector<std::string> formatsName = PlaYUVerStream::supportedReadFormatsName();
std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedReadFormats();
for( UInt i = 0; i < formatsName.size(); i++ )
for( UInt i = 0; i < supportedFmts.size(); i++ )
{
QString currFmt;
supported.append( " *." );
supported.append( QString::fromStdString( formatsExt[i] ) );
currFmt.append( QString::fromStdString( formatsName[i] ) );
supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
currFmt.append( " (*." );
currFmt.append( QString::fromStdString( formatsExt[i] ) );
currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
currFmt.append( ")" );
formatsList << currFmt;
}
@@ -306,17 +305,16 @@ Void PlaYUVerApp::save()
VideoSubWindow *saveWindow = m_pcCurrentVideoSubWindow;
QString supported = tr( "Supported Files (" );
QStringList formatsList;
std::vector<std::string> formatsExt = PlaYUVerStream::supportedSaveFormatsExt();
std::vector<std::string> formatsName = PlaYUVerStream::supportedSaveFormatsName();
for( UInt i = 0; i < formatsName.size(); i++ )
std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedSaveFormats();
for( UInt i = 0; i < supportedFmts.size(); i++ )
{
QString currFmt;
supported.append( " *." );
supported.append( QString::fromStdString( formatsExt[i] ) );
currFmt.append( QString::fromStdString( formatsName[i] ) );
supported.append( QString::fromStdString( supportedFmts[i].formatExt ) );
currFmt.append( QString::fromStdString( supportedFmts[i].formatName ) );
currFmt.append( " (*." );
currFmt.append( QString::fromStdString( formatsExt[i] ) );
currFmt.append( QString::fromStdString( supportedFmts[i].formatExt ) );
currFmt.append( ")" );
formatsList << currFmt;
}
+17 -41
View File
@@ -32,54 +32,30 @@
namespace plaYUVer
{
std::vector<std::string> LibAvContextHandle::supportedReadFormatsExt()
std::vector<PlaYUVerSupportedFormat> LibAvContextHandle::supportedReadFormats()
{
std::vector<std::string> formatsExt;
formatsExt.push_back( "avi" );
formatsExt.push_back( "mp4" );
formatsExt.push_back( "wmv" );
formatsExt.push_back( "pgm" );
formatsExt.push_back( "png" );
formatsExt.push_back( "bmp" );
formatsExt.push_back( "jpg" );
return formatsExt;
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
REGIST_PLAYUVER_SUPPORTED_FMT( "Portable Grayscale Map ", "pgm" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Portable Network Graphics", "png" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Joint Photographic Experts Group", "jpg" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Windows Bitmap", "bmp" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Audio video interleaved", "avi" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Windows media video", "wmv" );
REGIST_PLAYUVER_SUPPORTED_FMT( "MPEG4", "mp4" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Matroska Multimedia Container", "mkv" );
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
std::vector<std::string> LibAvContextHandle::supportedReadFormatsName()
std::vector<PlaYUVerSupportedFormat> LibAvContextHandle::supportedWriteFormats()
{
std::vector<std::string> formatsName;
formatsName.push_back( "Audio video interleaved" );
formatsName.push_back( "MPEG4" );
formatsName.push_back( "Windows media video" );
formatsName.push_back( "Portable Grayscale Map" );
formatsName.push_back( "Portable Network Graphics" );
formatsName.push_back( "Windows Bitmap" );
formatsName.push_back( "Joint Photographic Experts Group" );
return formatsName;
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
std::vector<std::string> LibAvContextHandle::supportedWriteFormatsExt()
std::vector<PlaYUVerSupportedFormat> LibAvContextHandle::supportedSaveFormats()
{
std::vector<std::string> formatsExt;
return formatsExt;
}
std::vector<std::string> LibAvContextHandle::supportedWriteFormatsName()
{
std::vector<std::string> formatsName;
return formatsName;
}
std::vector<std::string> LibAvContextHandle::supportedSaveFormatsExt()
{
std::vector<std::string> formatsExt;
return formatsExt;
}
std::vector<std::string> LibAvContextHandle::supportedSaveFormatsName()
{
std::vector<std::string> formatsName;
return formatsName;
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
static int open_codec_context( int *stream_idx, AVFormatContext *fmt_ctx, enum AVMediaType type )
+4 -6
View File
@@ -48,6 +48,7 @@ extern "C"
}
#include "PlaYUVerDefs.h"
#include "PlaYUVerStream.h"
namespace plaYUVer
{
@@ -56,12 +57,9 @@ class LibAvContextHandle
{
public:
static std::vector<std::string> supportedReadFormatsExt();
static std::vector<std::string> supportedReadFormatsName();
static std::vector<std::string> supportedWriteFormatsExt();
static std::vector<std::string> supportedWriteFormatsName();
static std::vector<std::string> supportedSaveFormatsExt();
static std::vector<std::string> supportedSaveFormatsName();
static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
static std::vector<PlaYUVerSupportedFormat> supportedSaveFormats();
LibAvContextHandle() :
m_bHasStream( false )
+14 -33
View File
@@ -32,46 +32,27 @@
namespace plaYUVer
{
std::vector<std::string> LibOpenCVHandler::supportedReadFormatsExt()
std::vector<PlaYUVerSupportedFormat> LibOpenCVHandler::supportedReadFormats()
{
std::vector<std::string> formatsExt;
formatsExt.push_back( "pgm" );
formatsExt.push_back( "png" );
formatsExt.push_back( "bmp" );
formatsExt.push_back( "jpg" );
return formatsExt;
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
REGIST_PLAYUVER_SUPPORTED_FMT( "Portable Grayscale Map ", "pgm" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Portable Network Graphics", "png" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Joint Photographic Experts Group", "jpg" );
REGIST_PLAYUVER_SUPPORTED_FMT( "Windows Bitmap", "bmp" );
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
std::vector<std::string> LibOpenCVHandler::supportedReadFormatsName()
std::vector<PlaYUVerSupportedFormat> LibOpenCVHandler::supportedWriteFormats()
{
std::vector<std::string> formatsName;
formatsName.push_back( "Portable Grayscale Map" );
formatsName.push_back( "Portable Network Graphics" );
formatsName.push_back( "Windows Bitmap" );
formatsName.push_back( "Joint Photographic Experts Group" );
return formatsName;
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
std::vector<std::string> LibOpenCVHandler::supportedWriteFormatsExt()
std::vector<PlaYUVerSupportedFormat> LibOpenCVHandler::supportedSaveFormats()
{
std::vector<std::string> formatsExt;
return formatsExt;
}
std::vector<std::string> LibOpenCVHandler::supportedWriteFormatsName()
{
std::vector<std::string> formatsName;
return formatsName;
}
std::vector<std::string> LibOpenCVHandler::supportedSaveFormatsExt()
{
return supportedReadFormatsExt();
}
std::vector<std::string> LibOpenCVHandler::supportedSaveFormatsName()
{
return supportedReadFormatsName();
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
APPEND_PLAYUVER_SUPPORTED_FMT( LibOpenCVHandler, Read );
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
PlaYUVerFrame* LibOpenCVHandler::loadFrame( std::string filename )
+4 -6
View File
@@ -31,6 +31,7 @@
#include <string>
#include <opencv2/opencv.hpp>
#include "PlaYUVerDefs.h"
#include "PlaYUVerStream.h"
namespace plaYUVer
{
@@ -41,12 +42,9 @@ class LibOpenCVHandler
{
public:
static std::vector<std::string> supportedReadFormatsExt();
static std::vector<std::string> supportedReadFormatsName();
static std::vector<std::string> supportedWriteFormatsExt();
static std::vector<std::string> supportedWriteFormatsName();
static std::vector<std::string> supportedSaveFormatsExt();
static std::vector<std::string> supportedSaveFormatsName();
static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
static std::vector<PlaYUVerSupportedFormat> supportedSaveFormats();
LibOpenCVHandler()
{
+34 -58
View File
@@ -38,71 +38,44 @@
namespace plaYUVer
{
std::vector<std::string> PlaYUVerStream::supportedReadFormatsExt()
std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedReadFormats()
{
std::vector<std::string> formatsExt;
formatsExt.push_back( "yuv" );
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
REGIST_PLAYUVER_SUPPORTED_FMT( "Raw Video", "yuv" );
#ifdef USE_FFMPEG
std::vector<std::string> libAvFmt = LibAvContextHandle::supportedReadFormatsExt();
formatsExt.insert( formatsExt.end(), libAvFmt.begin(), libAvFmt.end() );
APPEND_PLAYUVER_SUPPORTED_FMT( LibAvContextHandle, Read );
#endif
//#ifdef USE_OPENCV
// std::vector<std::string> opencvFmt = LibOpenCVHandler::supportedReadFormatsExt();
// formatsExt.insert( formatsExt.end(), opencvFmt.begin(), opencvFmt.end() );
// APPEND_PLAYUVER_SUPPORTED_FMT( LibOpenCVHandler );
//#endif
return formatsExt;
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
std::vector<std::string> PlaYUVerStream::supportedReadFormatsName()
std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedWriteFormats()
{
std::vector<std::string> formatsName;
formatsName.push_back( "Raw video" );
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
REGIST_PLAYUVER_SUPPORTED_FMT( "Raw Video", "yuv" );
#ifdef USE_FFMPEG
std::vector<std::string> libAvFmt = LibAvContextHandle::supportedReadFormatsName();
formatsName.insert( formatsName.end(), libAvFmt.begin(), libAvFmt.end() );
APPEND_PLAYUVER_SUPPORTED_FMT( LibAvContextHandle, Write );
#endif
//#ifdef USE_OPENCV
// std::vector<std::string> opencvFmt = LibOpenCVHandler::supportedReadFormatsName();
// formatsName.insert( formatsName.end(), opencvFmt.begin(), opencvFmt.end() );
//#endif
return formatsName;
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
std::vector<std::string> PlaYUVerStream::supportedWriteFormatsExt()
std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedSaveFormats()
{
std::vector<std::string> formatsExt;
formatsExt.push_back( "yuv" );
return formatsExt;
}
std::vector<std::string> PlaYUVerStream::supportedWriteFormatsName()
{
std::vector<std::string> formatsName;
formatsName.push_back( "Raw video" );
return formatsName;
}
std::vector<std::string> PlaYUVerStream::supportedSaveFormatsExt()
{
std::vector<std::string> formatsExt = supportedWriteFormatsExt();
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
APPEND_PLAYUVER_SUPPORTED_FMT( PlaYUVerStream, Write );
#ifdef USE_FFMPEG
APPEND_PLAYUVER_SUPPORTED_FMT( LibAvContextHandle, Save );
#endif
#ifdef USE_OPENCV
std::vector<std::string> opencvFmt = LibOpenCVHandler::supportedSaveFormatsExt();
formatsExt.insert( formatsExt.end(), opencvFmt.begin(), opencvFmt.end() );
APPEND_PLAYUVER_SUPPORTED_FMT( LibOpenCVHandler, Save );
#endif
formatsExt.erase( unique( formatsExt.begin(), formatsExt.end() ), formatsExt.end() );
return formatsExt;
END_REGIST_PLAYUVER_SUPPORTED_FMT;
}
std::vector<std::string> PlaYUVerStream::supportedSaveFormatsName()
std::vector<PlaYUVerStdResolution> PlaYUVerStream::stdResolutionSizes()
{
std::vector<std::string> formatsName = supportedWriteFormatsName();
#ifdef USE_OPENCV
std::vector<std::string> opencvFmt = LibOpenCVHandler::supportedSaveFormatsName();
formatsName.insert( formatsName.end(), opencvFmt.begin(), opencvFmt.end() );
#endif
formatsName.erase( unique( formatsName.begin(), formatsName.end() ), formatsName.end() );
return formatsName;
}
#define REGIST_PLAYUVER_STANDARD_RESOLUTION( name, width, height) \
stdResElement.shortName = name; \
@@ -110,8 +83,6 @@ std::vector<std::string> PlaYUVerStream::supportedSaveFormatsName()
stdResElement.uiHeight = height; \
stdResList.push_back( stdResElement );
std::vector<PlaYUVerStdResolution> PlaYUVerStream::stdResolutionSizes()
{
std::vector<PlaYUVerStdResolution> stdResList;
PlaYUVerStdResolution stdResElement;
REGIST_PLAYUVER_STANDARD_RESOLUTION( "CIF", 352, 288 );
@@ -174,14 +145,17 @@ Void PlaYUVerStream::findHandler()
}
std::string currExt = m_cFilename.substr( m_cFilename.find_last_of( "." ) + 1 );
currExt = lowercase( currExt );
if( m_bIsInput )
{
#ifdef USE_FFMPEG
for( UInt i = 0; i < LibAvContextHandle::supportedReadFormatsExt().size(); i++ )
std::vector<PlaYUVerSupportedFormat> supportedFmts = LibAvContextHandle::supportedReadFormats();
for( UInt i = 0; i < supportedFmts.size(); i++ )
{
if( LibAvContextHandle::supportedReadFormatsExt()[i] == lowercase( currExt ) )
if( supportedFmts[i].formatExt == currExt )
{
m_cFormatName = LibAvContextHandle::supportedReadFormatsExt()[i];
m_cFormatName = supportedFmts[i].formatExt[i];
m_iStreamHandler = FFMPEG;
return;
}
@@ -193,11 +167,12 @@ Void PlaYUVerStream::findHandler()
else
{
#ifdef USE_FFMPEG
for( UInt i = 0; i < LibAvContextHandle::supportedWriteFormatsExt().size(); i++ )
std::vector<PlaYUVerSupportedFormat> supportedFmts = LibAvContextHandle::supportedWriteFormats();
for( UInt i = 0; i < supportedFmts.size(); i++ )
{
if( LibAvContextHandle::supportedWriteFormatsExt()[i] == lowercase( currExt ) )
if( supportedFmts[i].formatExt == currExt )
{
m_cFormatName = LibAvContextHandle::supportedWriteFormatsExt()[i];
m_cFormatName = supportedFmts[i].formatExt;
m_iStreamHandler = FFMPEG;
return;
}
@@ -651,12 +626,13 @@ Bool PlaYUVerStream::saveFrame( const std::string& filename, PlaYUVerFrame *save
//std::string currExt = QFileInfo( qtString ).suffix().toStdString();
std::string currExt = filename.substr( filename.find_last_of( "." ) + 1 );
for( UInt i = 0; i < PlaYUVerStream::supportedSaveFormatsExt().size(); i++ )
std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedSaveFormats();
for( UInt i = 0; i < supportedFmts.size(); i++ )
{
if( PlaYUVerStream::supportedSaveFormatsExt()[i] == currExt )
if( supportedFmts[i].formatExt == currExt )
{
iFileFormat = i;
fmtExt = PlaYUVerStream::supportedSaveFormatsExt()[i];
fmtExt = supportedFmts[i].formatExt[i];
break;
}
}
+27 -6
View File
@@ -45,6 +45,30 @@ typedef struct
UInt uiHeight;
} PlaYUVerStdResolution;
typedef struct
{
std::string formatName;
std::string formatExt;
} PlaYUVerSupportedFormat;
#define INI_REGIST_PLAYUVER_SUPPORTED_FMT \
std::vector<PlaYUVerSupportedFormat> formatsList; \
PlaYUVerSupportedFormat formatElem;
#define END_REGIST_PLAYUVER_SUPPORTED_FMT \
return formatsList;
#define REGIST_PLAYUVER_SUPPORTED_FMT( name, ext ) \
formatElem.formatName = name; \
formatElem.formatExt = lowercase( ext ); \
formatsList.push_back( formatElem );
#define APPEND_PLAYUVER_SUPPORTED_FMT( class_name, fct ) \
{ \
std::vector<PlaYUVerSupportedFormat> new_fmts = class_name::supported##fct##Formats(); \
formatsList.insert( formatsList.end(), new_fmts.begin(), new_fmts.end() ); \
}
/**
* \class PlaYUVerStream
* \ingroup PlaYUVerLib PlaYUVerLib_Stream
@@ -99,12 +123,9 @@ private:
public:
static std::vector<std::string> supportedReadFormatsExt();
static std::vector<std::string> supportedReadFormatsName();
static std::vector<std::string> supportedWriteFormatsExt();
static std::vector<std::string> supportedWriteFormatsName();
static std::vector<std::string> supportedSaveFormatsExt();
static std::vector<std::string> supportedSaveFormatsName();
static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
static std::vector<PlaYUVerSupportedFormat> supportedSaveFormats();
static std::vector<PlaYUVerStdResolution> stdResolutionSizes();