Merge branch 'jfmcarreira-dev'
This commit is contained in:
commit
58d60a2d73
3 files changed
+14
-6
No files matched your search
@@ -43,6 +43,8 @@ InputStream::InputStream()
|
||||
m_iErrorStatus = 0;
|
||||
m_iPixelFormat = -1;
|
||||
|
||||
m_uiFrameRate = 25;
|
||||
|
||||
m_iFileFormat = INVALID;
|
||||
}
|
||||
|
||||
@@ -62,7 +64,8 @@ QString InputStream::supportedReadFormats()
|
||||
{
|
||||
QString formats;
|
||||
formats = "*.yuv " // Raw video
|
||||
"*.avi"// Audio video interleaved
|
||||
"*.avi "// Audio video interleaved
|
||||
"*.wmv "// Windows media video
|
||||
;
|
||||
return formats;
|
||||
}
|
||||
@@ -84,6 +87,7 @@ QStringList InputStream::supportedReadFormatsList()
|
||||
QStringList formats;
|
||||
formats << "Raw video (*.yuv)" // Raw video
|
||||
<< "Audio video interleaved (*.avi)" // Audio video interleaved
|
||||
<< "Windows media video (*.wmv)" // Windows media video
|
||||
;
|
||||
|
||||
return formats;
|
||||
@@ -190,7 +194,7 @@ Void InputStream::readFrame()
|
||||
if( bytes_read != frame_bytes_input )
|
||||
{
|
||||
m_iErrorStatus = READING;
|
||||
qDebug() << " Reading error !!!" << endl;
|
||||
qDebug( ) << " Reading error !!!" << endl;
|
||||
return;
|
||||
}
|
||||
m_cCurrFrame->FrameFromBuffer( m_pInputBuffer, m_iPixelFormat );
|
||||
|
||||
@@ -70,6 +70,7 @@ private:
|
||||
|
||||
UInt m_uiWidth;
|
||||
UInt m_uiHeight;
|
||||
UInt m_uiFrameRate;
|
||||
UInt m_uiTotalFrameNum;
|
||||
UInt m_uiCurrFrameNum;
|
||||
|
||||
@@ -126,6 +127,10 @@ public:
|
||||
{
|
||||
return m_uiCurrFrameNum;
|
||||
}
|
||||
UInt getFrameRate()
|
||||
{
|
||||
return m_uiFrameRate;
|
||||
}
|
||||
|
||||
Void setWidth( UInt new_width )
|
||||
{
|
||||
|
||||
@@ -135,10 +135,9 @@ Bool LibAvContextHandle::initAvFormat( QString filename, UInt& width, UInt& heig
|
||||
video_dst_bufsize = ret;
|
||||
}
|
||||
|
||||
AVCodecContext *in_codec = fmt_ctx->streams[0]->codec;
|
||||
width = in_codec->width;
|
||||
height = in_codec->height;
|
||||
switch( in_codec->pix_fmt )
|
||||
width = video_dec_ctx->width;
|
||||
height = video_dec_ctx->height;
|
||||
switch( video_dec_ctx->pix_fmt )
|
||||
{
|
||||
case AV_PIX_FMT_YUV420P:
|
||||
pixel_format = PlaYUVerFrame::YUV420;
|
||||
|
||||
Reference in new issue
Block a user