From d9952f61a53b693a75490e4932d7136e14e7dc08 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 01 九月 2020 15:22:05 +0800
Subject: [PATCH] bug fixed

---
 csrc/wrapper.cpp |   66 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 3e34b2c..e0aef2d 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -45,6 +45,7 @@
     ,audio_(false)
     ,gb_(0)
     ,cpu_(0)
+    ,devid_(-1)
     ,run_dec_(false)
     ,run_stream_(true)
     ,run_rec_(false)
@@ -55,6 +56,8 @@
     ,rec_(new rec)
     ,logit_(false)
     ,fps_(25)
+    ,file_finished_(false)
+    ,min_duration_(0)
     {
         makeTheWorld();
     }
@@ -64,6 +67,7 @@
     ,audio_(false)
     ,gb_(0)
     ,cpu_(0)
+    ,devid_(-1)
     ,run_dec_(false)
     ,run_stream_(true)
     ,run_rec_(false)
@@ -73,6 +77,9 @@
     ,decoder_(nullptr)
     ,rec_(new rec)
     ,logit_(true)
+    ,fps_(25)
+    ,file_finished_(false)
+    ,min_duration_(0)
     {
         makeTheWorld();
         logif::CreateLogger(logfile, true);
@@ -103,8 +110,9 @@
         prop.url_ = input;
         prop.rtsp_tcp_ = true;
         prop.gpu_acc_ = !cpu_;
+        prop.gpu_index_ = devid_;
 
-    	std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
+    	std::unique_ptr<FormatIn> in(new FormatIn(prop, prop.gpuAccl()));
     	int flag = -1;
         if (gb_){
             flag = in->openGb28181(input, NULL);
@@ -188,6 +196,9 @@
 
     void Wrapper::run_stream_thread(){
         
+        int64_t file_rebootime = 0;
+        int64_t file_frame = 0;
+
         while(!stop_stream_.load()){
             auto in = init_reader(input_url_.c_str());
             
@@ -199,9 +210,12 @@
 
             fps_ = in->getFPS();
             
-            int wTime = 1000000.0 / in->getFPS() ;
+            if (fps_ < 1 || fps_ > 200){
+                fps_ = 25;
+            }
+
+            int wTime = 1000000.0 / fps_ ;
             wTime >>= 1;
-            logIt("WAIT TIME PER FRAME: %d", wTime);
 
             init_worker(in.get());
 
@@ -210,6 +224,12 @@
             int64_t a_id = id;
 
             bool exist = access(input_url_.c_str(), 0) == 0;
+            if (exist){
+                wTime += wTime/2;
+                file_rebootime++;
+            }
+
+            logIt("WAIT TIME PER FRAME: %d", wTime);
 
             while(!stop_stream_.load()){
                 auto data(std::make_shared<CodedData>());
@@ -221,6 +241,7 @@
                 if (in->notVideoAudio(&data->getAVPacket())){
                     continue;
                 }
+
                 // 闈炲浗鏍囪烦杩囩涓�甯�,娴嬭瘯绗竴甯ф湁闂
                 if (!gb_ && id < 0){
                     id++; v_id++; a_id++;
@@ -241,19 +262,37 @@
                 id++;
 
                 //鏈湴鏂囦欢澶揩sleep涓�涓�
-                if (exist){
+                if (exist && in->isVideoPkt(&data->getAVPacket())){
+                    // 璁板綍瑙ｇ爜鐨勬枃浠舵湁澶氬皯甯�
+                    file_frame++;
                     usleep(wTime);
                 }
 
             }
 
             deinit_worker();
-            if (exist) break;
+            if (exist) {
+                // 涓夋涓�甯ч兘娌¤В鍑烘潵锛岄��鍑�
+                if (file_frame == 0 && file_rebootime < 3){
+                    logIt("libcffmpeg.so-> run %lld time, current frames %lld", file_rebootime, file_frame);
+                    continue;
+                }
+                // 鏈�灏忛渶瑕佽В鍑哄灏戝抚
+                if (file_frame < min_duration_ * fps_){
+                    logIt("libcffmpeg.so-> run %lld time, current frames %lld, mind %d, fps: %d",
+                     file_rebootime, file_frame, min_duration_, fps_);
+                    continue;
+                }
+                logIt("libcffmpeg.so-> local file %s run %lld time, all frames %lld, mind %d, fps: %d", 
+                    input_url_.c_str(), file_rebootime, file_frame, min_duration_, fps_);
+                file_finished_ = true;
+                break;
+            }
         }
     }
 
-    void Wrapper::SetRecMinCacheTime(const int mind){
-        rec_->SetRecMinCacheTime(mind);
+    void Wrapper::SetRecMinCacheTime(const int mind, const int maxd){
+        min_duration_ = mind;
     }
 
     void Wrapper::OpenRecorder(){
@@ -276,32 +315,39 @@
         if (rec_->Loaded()){
             rec_->FireRecSignal(sid, id);
         }
+        return 0;
     }
 
-    void Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
+    int Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
         if (rec_){
             rec_->GetRecInfo(recID, index, path);
         }
+        return 0;
     }
     ////////decoder
     void Wrapper::OpenDecoder(){
         run_dec_ = true;
     }
 
-    void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+    int Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+        if (file_finished_){
+            return -1;
+        }
         if (decoder_){
             decoder_->GetFrame(data, w, h, format, length, id);
         }
+        return 0;
     }
     
     void Wrapper::CloseStream(){
         run_stream_ = false;
     }
 
-    void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
+    int Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
         if (stream_){
             stream_->GetPacket(pktData, size, key);
         }
+        return 0;
     }
 
 } // end class wrapper

--
Gitblit v1.8.0