Clean PlaYUVerStream and remove PlaYUVer from some code files due to long filename

This commit is contained in:
jfmcarreira committed 2014-11-18 16:42:50 +00:00
1 parent 742c9e1522
commit d05a9b7d5e
11 files changed
+86 -332

No files matched your search

-47
View File
@@ -34,47 +34,6 @@
namespace plaYUVer
{
QDataStream& operator<<( QDataStream& out, const PlaYUVerStreamInfoVector& array )
{
PlaYUVerStreamInfo d;
out << array.size();
for( Int i = 0; i < array.size(); i++ )
{
d = array.at( i );
out << d.m_cFilename << d.m_uiWidth
<< d.m_uiHeight
<< d.m_iPelFormat
<< d.m_uiFrameRate;
}
return out;
}
QDataStream& operator>>( QDataStream& in, PlaYUVerStreamInfoVector& array )
{
PlaYUVerStreamInfo d;
Int array_size;
in >> array_size;
for( Int i = 0; i < array_size; i++ )
{
in >> d.m_cFilename;
in >> d.m_uiWidth;
in >> d.m_uiHeight;
in >> d.m_iPelFormat;
in >> d.m_uiFrameRate;
array.append( d );
}
return in;
}
Int findPlaYUVerStreamInfo( PlaYUVerStreamInfoVector array, QString filename )
{
for( Int i = 0; i < array.size(); i++ )
if( array.at( i ).m_cFilename == filename )
return i;
return -1;
}
PlaYUVerStream::PlaYUVerStream()
{
m_bInit = false;
@@ -243,12 +202,6 @@ Bool PlaYUVerStream::open( QString filename, UInt width, UInt height, Int input_
m_cStreamInformationString = "[" + m_cFormatName + " / " + m_cCodedName + " / " + PlaYUVerFrame::supportedPixelFormatListNames().at( m_iPixelFormat ) + "] "
+ QFileInfo( m_cFilename ).fileName();
m_sStreamInfo.m_cFilename = m_cFilename;
m_sStreamInfo.m_uiWidth = m_uiWidth;
m_sStreamInfo.m_uiHeight = m_uiHeight;
m_sStreamInfo.m_iPelFormat = m_iPixelFormat;
m_sStreamInfo.m_uiFrameRate = m_uiFrameRate;
m_iCurrFrameNum = -1;
m_bInit = true;
-23
View File
@@ -36,20 +36,6 @@ namespace plaYUVer
class LibAvContextHandle;
typedef struct
{
QString m_cFilename;
UInt m_uiWidth;
UInt m_uiHeight;
Int m_iPelFormat;
UInt m_uiFrameRate;
}PlaYUVerStreamInfo;
typedef QVector<PlaYUVerStreamInfo> PlaYUVerStreamInfoVector;
QDataStream& operator<<(QDataStream& out, const PlaYUVerStreamInfoVector& d);
QDataStream& operator>>(QDataStream& in, PlaYUVerStreamInfoVector& d);
Int findPlaYUVerStreamInfo( PlaYUVerStreamInfoVector array, QString filename );
class PlaYUVerStream
{
private:
@@ -61,8 +47,6 @@ private:
Bool m_bLoadAll;
Int m_iErrorStatus;
PlaYUVerStreamInfo m_sStreamInfo;
LibAvContextHandle* m_cLibAvContext;
QString m_cFilename;
@@ -313,15 +297,8 @@ public:
m_uiHeight = new_height;
}
}
PlaYUVerStreamInfo getStreamInfo()
{
return m_sStreamInfo;
}
};
} // NAMESPACE
Q_DECLARE_METATYPE(plaYUVer::PlaYUVerStreamInfo);
Q_DECLARE_METATYPE(plaYUVer::PlaYUVerStreamInfoVector);
#endif // __PLAYUVERSTREAM_H__