From 52b0ef0b8d617de555808f6e2dbeffa311711155 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 09 三月 2020 16:48:00 +0800
Subject: [PATCH] local file quit signal

---
 csrc/wrapper.cpp |   89 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 373ec37..5e50469 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -46,6 +46,8 @@
     ,gb_(0)
     ,cpu_(0)
     ,run_dec_(false)
+    ,run_stream_(true)
+    ,run_rec_(false)
     ,thread_(nullptr)
     ,stop_stream_(false)
     ,stream_(nullptr)
@@ -53,6 +55,7 @@
     ,rec_(new rec)
     ,logit_(false)
     ,fps_(25)
+    ,file_finished_(false)
     {
         makeTheWorld();
     }
@@ -63,12 +66,16 @@
     ,gb_(0)
     ,cpu_(0)
     ,run_dec_(false)
+    ,run_stream_(true)
+    ,run_rec_(false)
     ,thread_(nullptr)
     ,stop_stream_(false)
     ,stream_(nullptr)
     ,decoder_(nullptr)
     ,rec_(new rec)
     ,logit_(true)
+    ,fps_(25)
+    ,file_finished_(false)
     {
         makeTheWorld();
         logif::CreateLogger(logfile, true);
@@ -101,16 +108,19 @@
         prop.gpu_acc_ = !cpu_;
 
     	std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
-    	AVDictionary *avdic = prop.optsFormat();
     	int flag = -1;
         if (gb_){
             flag = in->openGb28181(input, NULL);
         }else{
-            flag = in->open(input, &avdic);
+    	    AVDictionary *avdic = prop.optsFormat();
+            if(avdic){
+                flag = in->open(input, &avdic);
+    	    	av_dict_free(&avdic);
+    	    }else{
+                flag = in->open(input, NULL);
+            }
         }
-    	if(avdic){
-    		av_dict_free(&avdic);
-    	}
+    	
         if(flag == 0){
             if(!in->findStreamInfo(NULL)){
                 logIt("can't find video stream\n");
@@ -150,7 +160,7 @@
 
         stream_ = new stream(in, 3 * in->getFPS());
         // stream_->AudioSwitch(audio_);
-
+        
         decoder_ = new decoder(in);
 
         rec_->Load(in);
@@ -166,9 +176,9 @@
             p.pts = p.dts = AV_NOPTS_VALUE;
         }
         int flag = 0;
-        if (stream_) stream_->SetPacket(pkt);
-        if (decoder_ && run_dec_) flag = decoder_->SetFrame(pkt);
-        if (rec_->Loaded()) rec_->SetPacket(pkt);
+        if (run_stream_ && stream_) stream_->SetPacket(pkt);
+        if (run_dec_ && decoder_) flag = decoder_->SetFrame(pkt);
+        if (run_rec_ && rec_->Loaded()) rec_->SetPacket(pkt);
 
         return flag;
     }
@@ -192,9 +202,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());
 
@@ -202,7 +215,12 @@
             int64_t v_id = id;
             int64_t a_id = id;
 
-            bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
+            bool exist = access(input_url_.c_str(), 0) == 0;
+            if (exist){
+                wTime <<= 1;
+            }
+
+            logIt("WAIT TIME PER FRAME: %d", wTime);
 
             while(!stop_stream_.load()){
                 auto data(std::make_shared<CodedData>());
@@ -241,7 +259,11 @@
             }
 
             deinit_worker();
-            if (exist) break;
+            if (exist) {
+                logIt("local file exist");
+                file_finished_ = true;
+                break;
+            }
         }
     }
 
@@ -249,6 +271,10 @@
         rec_->SetRecMinCacheTime(mind);
     }
 
+    void Wrapper::OpenRecorder(){
+        run_rec_ = true;
+    }
+    
     void Wrapper::BuildRecorder(const char* id, const char *output, const int64_t &fid, const int mindur, const int maxdur, const bool audio){
         bool a = audio;
         if (gb_) a = false;
@@ -261,7 +287,6 @@
             [=]{rec_->NewRec(rid.c_str(), dir.c_str(), fid, mindur, maxdur, a);};
         }
     }
-
     int Wrapper::FireRecorder(const char* sid,const int64_t &id){
         if (rec_->Loaded()){
             rec_->FireRecSignal(sid, id);
@@ -274,16 +299,29 @@
         }
     }
     ////////decoder
-    void Wrapper::BuildDecoder(){
+    void Wrapper::OpenDecoder(){
         run_dec_ = true;
     }
 
     void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+        if (file_finished_){
+            *data = (unsigned char*)this;
+            *w = 1080;
+            *h = 720;
+            *format = 23;
+            *length = 12;
+            *id = -10802020;
+            return;
+        }
         if (decoder_){
             decoder_->GetFrame(data, w, h, format, length, id);
         }
     }
     
+    void Wrapper::CloseStream(){
+        run_stream_ = false;
+    }
+
     void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
         if (stream_){
             stream_->GetPacket(pktData, size, key);
@@ -392,5 +430,26 @@
 
         return flag;
     }
+
+    int GetGb28181Pic(const char *rtspUrl, char *retData, int *retDataLen){
+        int ret = 0;
+        std::string fn = rtspUrl;
+
+        auto handle_gb28181 = new GB28181API;
+        if(handle_gb28181->addCamera(fn) == -1){
+            delete(handle_gb28181);
+            logIt("do addCamera Error\n");
+            return -1;
+        }
+
+        int retLen = handle_gb28181->capturePic(handle_gb28181, retData, retDataLen);
+        if(retLen == 0){
+            logIt("do capturePic failed:%d");
+            ret = -1;
+        }
+
+        handle_gb28181->deleteCamera();
+        return ret;
+    }
 }
 

--
Gitblit v1.8.0