From a8b447be656145c9ba2a2d8319a10ae8f726de1f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 09 十月 2020 18:20:46 +0800
Subject: [PATCH] h264 mp4

---
 csrc/wrapper.cpp |   54 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 5e50469..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)
@@ -56,6 +57,7 @@
     ,logit_(false)
     ,fps_(25)
     ,file_finished_(false)
+    ,min_duration_(0)
     {
         makeTheWorld();
     }
@@ -65,6 +67,7 @@
     ,audio_(false)
     ,gb_(0)
     ,cpu_(0)
+    ,devid_(-1)
     ,run_dec_(false)
     ,run_stream_(true)
     ,run_rec_(false)
@@ -76,6 +79,7 @@
     ,logit_(true)
     ,fps_(25)
     ,file_finished_(false)
+    ,min_duration_(0)
     {
         makeTheWorld();
         logif::CreateLogger(logfile, true);
@@ -106,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);
@@ -191,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());
             
@@ -217,7 +225,8 @@
 
             bool exist = access(input_url_.c_str(), 0) == 0;
             if (exist){
-                wTime <<= 1;
+                wTime += wTime/2;
+                file_rebootime++;
             }
 
             logIt("WAIT TIME PER FRAME: %d", wTime);
@@ -232,6 +241,7 @@
                 if (in->notVideoAudio(&data->getAVPacket())){
                     continue;
                 }
+
                 // 闈炲浗鏍囪烦杩囩涓�甯�,娴嬭瘯绗竴甯ф湁闂
                 if (!gb_ && id < 0){
                     id++; v_id++; a_id++;
@@ -252,7 +262,9 @@
                 id++;
 
                 //鏈湴鏂囦欢澶揩sleep涓�涓�
-                if (exist){
+                if (exist && in->isVideoPkt(&data->getAVPacket())){
+                    // 璁板綍瑙ｇ爜鐨勬枃浠舵湁澶氬皯甯�
+                    file_frame++;
                     usleep(wTime);
                 }
 
@@ -260,15 +272,27 @@
 
             deinit_worker();
             if (exist) {
-                logIt("local file 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(){
@@ -291,41 +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_){
-            *data = (unsigned char*)this;
-            *w = 1080;
-            *h = 720;
-            *format = 23;
-            *length = 12;
-            *id = -10802020;
-            return;
+            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