|
@@ -170,7 +170,7 @@ void DecodeVedio::setCurrentPos(qint64 pos)
|
|
|
while (m_queueImage.QueueSize() > 0)
|
|
|
{
|
|
|
image = nullptr;
|
|
|
- m_queueImage.front_pop_NoBlock(image);
|
|
|
+ m_queueImage.front_pop_noBlock(image);
|
|
|
if(image != nullptr)
|
|
|
{
|
|
|
delete image;
|
|
@@ -205,7 +205,7 @@ QImage* DecodeVedio::getOneImage()
|
|
|
return nullptr;
|
|
|
}
|
|
|
QImage* image = nullptr;
|
|
|
- if(!m_queueImage.front_pop_NoBlock(image))
|
|
|
+ if(!m_queueImage.front_pop_noBlock(image))
|
|
|
{
|
|
|
return nullptr;
|
|
|
}
|
|
@@ -232,7 +232,7 @@ QImage* DecodeVedio::getOneImageUntilHave(int timeOut)
|
|
|
for(int i = 0; i < timeOut; i++)
|
|
|
{
|
|
|
QImage* image = nullptr;
|
|
|
- if(m_queueImage.front_pop_NoBlock(image))
|
|
|
+ if(m_queueImage.front_pop_noBlock(image))
|
|
|
{
|
|
|
return image;
|
|
|
}
|
|
@@ -375,7 +375,7 @@ void DecodeVedio::openVedio(const QString& fileName)
|
|
|
for(int i = 0; i < m_queueImage.QueueSize(); i++)
|
|
|
{
|
|
|
QImage* image = nullptr;
|
|
|
- if (m_queueImage.front_pop_NoBlock(image))
|
|
|
+ if (m_queueImage.front_pop_noBlock(image))
|
|
|
{
|
|
|
delete image;
|
|
|
}
|
|
@@ -975,13 +975,13 @@ void DecodeVedio::pauseDecode()
|
|
|
m_pauseDecode = true;
|
|
|
/* 队列出队两张图片,防止解码线程阻塞到环形队列满上面 */
|
|
|
QImage* image = nullptr;
|
|
|
- m_queueImage.front_pop_NoBlock(image);
|
|
|
+ m_queueImage.front_pop_noBlock(image);
|
|
|
if(image != nullptr)
|
|
|
{
|
|
|
delete image;
|
|
|
image = nullptr;
|
|
|
}
|
|
|
- m_queueImage.front_pop_NoBlock(image);
|
|
|
+ m_queueImage.front_pop_noBlock(image);
|
|
|
if(image != nullptr)
|
|
|
{
|
|
|
delete image;
|
|
@@ -1074,7 +1074,7 @@ void DecodeVedio::freeAll()
|
|
|
for(int i = 0; i < m_queueImage.QueueSize(); i++)
|
|
|
{
|
|
|
QImage* image = nullptr;
|
|
|
- if (m_queueImage.front_pop_NoBlock(image))
|
|
|
+ if (m_queueImage.front_pop_noBlock(image))
|
|
|
{
|
|
|
delete image;
|
|
|
}
|