diff --git a/.gitignore b/.gitignore index b55ce0b..2529948 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ ffmpeg-4.2/ .vscode/ +bin/ +.idea/ \ No newline at end of file diff --git a/src/FFNvDecoder.cpp b/src/FFNvDecoder.cpp index 3dc6519..4f759f7 100644 --- a/src/FFNvDecoder.cpp +++ b/src/FFNvDecoder.cpp @@ -167,7 +167,6 @@ void FFNvDecoder::decode_thread() while (m_bRunning) { - if (!m_bReal) { if (m_bPause) @@ -189,7 +188,7 @@ void FFNvDecoder::decode_thread() break; } - if (!m_bReal) + if (m_bReal) { if (m_bPause) { diff --git a/src/main.cpp b/src/main.cpp index 890b05f..27b7c9b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,15 +16,15 @@ void postDecoded(const void * userPtr, AVFrame * gpuFrame){ int main(){ FFNvDecoderManager* pDecManager = FFNvDecoderManager::getInstance(); - FFNvDecoder* decoder = pDecManager->createDecoder("rtmp://192.168.10.56:1935/objecteye/1",postDecoded,"dec1"); - if (!decoder) - { - return 1; - } - pDecManager->setUserPtr("dec1", decoder); - pDecManager->startDecodeByName("dec1"); - - FFNvDecoder* dec2 = pDecManager->createDecoder("/home/cmhu/data/test.mp4",postDecoded,"dec2"); + // FFNvDecoder* decoder = pDecManager->createDecoder("rtmp://192.168.10.56:1935/objecteye/1",postDecoded,"dec1"); + // if (!decoder) + // { + // return 1; + // } + // pDecManager->setUserPtr("dec1", decoder); + // pDecManager->startDecodeByName("dec1"); + + FFNvDecoder* dec2 = pDecManager->createDecoder("/home/cmhu/data/duan1.avi",postDecoded,"dec2"); if (!dec2) { return 1; @@ -35,11 +35,13 @@ int main(){ while (getchar() != 'q'); // pDecManager->closeDecoderByName("dec1"); - pDecManager->pauseDecoder("dec1"); + // pDecManager->pauseDecoder("dec1"); + pDecManager->pauseDecoder("dec2"); while (getchar() != 'q'); - pDecManager->resumeDecoder("dec1"); + // pDecManager->resumeDecoder("dec1"); + pDecManager->resumeDecoder("dec2"); while (getchar() != 'q');