jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bpp match

Browse Source
This commit is contained in:
jfmcarreira
2019-05-30 16:40:32 +01:00
parent b10a593e01
commit c26e7c2265
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/VideoSubWindow.cpp
+17 -15
View File
@@ -489,7 +489,8 @@ bool VideoSubWindow::guessFormat( QString filename, unsigned int& rWidth, unsign
} }
// Guess resolution - match %dx%d // Guess resolution - match %dx%d
QRegularExpressionMatch resolutionMatch = QRegularExpression( "_\\d*x\\d*" ).match( FilenameShort ); //QRegularExpressionMatch resolutionMatch = QRegularExpression( "_\\d*x\\d*" ).match( FilenameShort );
QRegularExpressionMatch resolutionMatch = QRegularExpression( "_[0-9]+x[0-9]+" ).match( FilenameShort );
if( resolutionMatch.hasMatch() ) if( resolutionMatch.hasMatch() )
{ {
QString resolutionString = resolutionMatch.captured( resolutionMatch.lastCapturedIndex() ); QString resolutionString = resolutionMatch.captured( resolutionMatch.lastCapturedIndex() );
@@ -537,8 +538,9 @@ bool VideoSubWindow::guessFormat( QString filename, unsigned int& rWidth, unsign
} }
} }
// [.|_]
// Guess bits per pixel - match %dbpp // Guess bits per pixel - match %dbpp
QRegularExpressionMatch BppMatch = QRegularExpression( "_\\d*bpp" ).match( FilenameShort ); QRegularExpressionMatch BppMatch = QRegularExpression( "_[0-9]+bpp" ).match( FilenameShort );
if( BppMatch.hasMatch() ) if( BppMatch.hasMatch() )
{ {
QString matchString = BppMatch.captured( BppMatch.lastCapturedIndex() ); QString matchString = BppMatch.captured( BppMatch.lastCapturedIndex() );
@@ -550,21 +552,21 @@ bool VideoSubWindow::guessFormat( QString filename, unsigned int& rWidth, unsign
rBitsPerPixel = -1; rBitsPerPixel = -1;
} }
} }
// QRegularExpressionMatch BppOnlybMatch = QRegularExpression( "_\\d*b" ).match( FilenameShort ); QRegularExpressionMatch BppOnlybMatch = QRegularExpression( "_[0-9]+b" ).match( FilenameShort );
// if( BppOnlybMatch.hasMatch() ) if( BppOnlybMatch.hasMatch() )
// { {
// QString matchString = BppOnlybMatch.captured( BppMatch.lastCapturedIndex() ); QString matchString = BppOnlybMatch.captured( BppOnlybMatch.lastCapturedIndex() );
// matchString.remove( "_" ); matchString.remove( "_" );
// matchString.remove( "bpp" ); matchString.remove( "b" );
// rBitsPerPixel = matchString.toUInt(); rBitsPerPixel = matchString.toUInt();
// if( !( rBitsPerPixel > 0 && rBitsPerPixel < 16 ) ) if( !( rBitsPerPixel > 0 && rBitsPerPixel < 16 ) )
// { {
// rBitsPerPixel = -1; rBitsPerPixel = -1;
// } }
// } }
// Guess frame rate - match %dbpp // Guess frame rate - match %dbpp
QRegularExpressionMatch FpsMatch = QRegularExpression( "_\\d*fps" ).match( FilenameShort ); QRegularExpressionMatch FpsMatch = QRegularExpression( "_[0-9]+fps" ).match( FilenameShort );
if( FpsMatch.hasMatch() ) if( FpsMatch.hasMatch() )
{ {
QString matchString = FpsMatch.captured( FpsMatch.lastCapturedIndex() ); QString matchString = FpsMatch.captured( FpsMatch.lastCapturedIndex() );