Merge branch 'devel'

This commit is contained in:
jfmcarreira committed 2015-03-09 18:29:00 +00:00
commit e7bf821c2c
29 files changed
+1603 -477

No files matched your search

+5 -3
View File
@@ -95,7 +95,7 @@ private:
UInt m_uiWidth;
UInt m_uiHeight;
UInt m_uiFrameRate;
Double m_dFrameRate;
UInt64 m_uiTotalFrameNum;
Int64 m_iCurrFrameNum;
@@ -134,6 +134,7 @@ public:
Void loadAll();
Void readFrame();
Void readFrameFillRGBBuffer();
Void writeFrame();
Void writeFrame( PlaYUVerFrame *pcFrame );
@@ -143,6 +144,7 @@ public:
Bool setNextFrame();
PlaYUVerFrame* getCurrFrame();
PlaYUVerFrame* getCurrFrame( PlaYUVerFrame * );
PlaYUVerFrame* getNextFrame();
Bool seekInput( UInt64 new_frame_num );
@@ -184,9 +186,9 @@ public:
{
return m_iCurrFrameNum;
}
UInt getFrameRate()
Double getFrameRate()
{
return m_uiFrameRate;
return m_dFrameRate;
}
Void getDuration( Int* duration_array );