Merge branch 'develCommanline' into devel

This commit is contained in:
jfmcarreira committed 2015-03-03 00:18:47 +00:00
commit 2a8073f2ce
19 files changed
+995 -72

No files matched your search

+7 -1
View File
@@ -172,7 +172,7 @@ Bool PlaYUVerStream::open( std::string filename, std::string resolution, std::st
}
for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames().size(); i++ )
{
if( PlaYUVerFrame::supportedPixelFormatListNames()[i] == input_format_name )
if( lowercase( PlaYUVerFrame::supportedPixelFormatListNames()[i] ) == lowercase( input_format_name ) )
{
input_format = i;
break;
@@ -636,6 +636,12 @@ PlaYUVerFrame* PlaYUVerStream::getCurrFrame()
return m_pcCurrFrame;
}
PlaYUVerFrame* PlaYUVerStream::getNextFrame()
{
return m_pcNextFrame;
}
Bool PlaYUVerStream::seekInput( UInt64 new_frame_num )
{
if( !m_bInit || new_frame_num < 0 || new_frame_num >= m_uiTotalFrameNum || ( Int64 )new_frame_num == m_iCurrFrameNum )