修正pause逻辑；添加ignore

Hu Chunming
1 parent 870559fd
Showing 3 changed files with 16 additions and 13 deletions
.gitignore
src/FFNvDecoder.cpp
src/main.cpp
 ffmpeg-4.2/
 .vscode/
+bin/
+.idea/
 \ No newline at end of file
@@ -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)
 			{
@@ -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');