Commit f49bbf3d1771f7c5c27472debe3c1699184ce293

Authored by Hu Chunming
1 parent 870559fd

修正pause逻辑;添加ignore

.gitignore
1 ffmpeg-4.2/ 1 ffmpeg-4.2/
2 .vscode/ 2 .vscode/
  3 +bin/
  4 +.idea/
3 \ No newline at end of file 5 \ No newline at end of file
src/FFNvDecoder.cpp
@@ -167,7 +167,6 @@ void FFNvDecoder::decode_thread() @@ -167,7 +167,6 @@ void FFNvDecoder::decode_thread()
167 167
168 while (m_bRunning) 168 while (m_bRunning)
169 { 169 {
170 -  
171 if (!m_bReal) 170 if (!m_bReal)
172 { 171 {
173 if (m_bPause) 172 if (m_bPause)
@@ -189,7 +188,7 @@ void FFNvDecoder::decode_thread() @@ -189,7 +188,7 @@ void FFNvDecoder::decode_thread()
189 break; 188 break;
190 } 189 }
191 190
192 - if (!m_bReal) 191 + if (m_bReal)
193 { 192 {
194 if (m_bPause) 193 if (m_bPause)
195 { 194 {
src/main.cpp
@@ -16,15 +16,15 @@ void postDecoded(const void * userPtr, AVFrame * gpuFrame){ @@ -16,15 +16,15 @@ void postDecoded(const void * userPtr, AVFrame * gpuFrame){
16 16
17 int main(){ 17 int main(){
18 FFNvDecoderManager* pDecManager = FFNvDecoderManager::getInstance(); 18 FFNvDecoderManager* pDecManager = FFNvDecoderManager::getInstance();
19 - FFNvDecoder* decoder = pDecManager->createDecoder("rtmp://192.168.10.56:1935/objecteye/1",postDecoded,"dec1");  
20 - if (!decoder)  
21 - {  
22 - return 1;  
23 - }  
24 - pDecManager->setUserPtr("dec1", decoder);  
25 - pDecManager->startDecodeByName("dec1");  
26 -  
27 - FFNvDecoder* dec2 = pDecManager->createDecoder("/home/cmhu/data/test.mp4",postDecoded,"dec2"); 19 + // FFNvDecoder* decoder = pDecManager->createDecoder("rtmp://192.168.10.56:1935/objecteye/1",postDecoded,"dec1");
  20 + // if (!decoder)
  21 + // {
  22 + // return 1;
  23 + // }
  24 + // pDecManager->setUserPtr("dec1", decoder);
  25 + // pDecManager->startDecodeByName("dec1");
  26 +
  27 + FFNvDecoder* dec2 = pDecManager->createDecoder("/home/cmhu/data/duan1.avi",postDecoded,"dec2");
28 if (!dec2) 28 if (!dec2)
29 { 29 {
30 return 1; 30 return 1;
@@ -35,11 +35,13 @@ int main(){ @@ -35,11 +35,13 @@ int main(){
35 while (getchar() != 'q'); 35 while (getchar() != 'q');
36 36
37 // pDecManager->closeDecoderByName("dec1"); 37 // pDecManager->closeDecoderByName("dec1");
38 - pDecManager->pauseDecoder("dec1"); 38 + // pDecManager->pauseDecoder("dec1");
  39 + pDecManager->pauseDecoder("dec2");
39 40
40 while (getchar() != 'q'); 41 while (getchar() != 'q');
41 42
42 - pDecManager->resumeDecoder("dec1"); 43 + // pDecManager->resumeDecoder("dec1");
  44 + pDecManager->resumeDecoder("dec2");
43 45
44 while (getchar() != 'q'); 46 while (getchar() != 'q');
45 47