From 18a05d269516a5e33d8460291c2f93e73d95adce Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 26 十二月 2023 10:45:31 +0800
Subject: [PATCH] GetYUV format is NV12

---
 csrc/wrapper.hpp |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 43e3f61..42f0c91 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -43,31 +43,37 @@
     public: //recorder
         void BuildRecorder(const char* id, const char *dir, const int64_t &fid, const int mind, const int maxd, const bool audio);
         int FireRecorder(const char* sid,const int64_t &id);
-        void GetInfoRecorder(std::string &recID, int &index, std::string &path);
+        int GetInfoRecorder(std::string &recID, int &index, std::string &path);
     
     public:
-        void GB28181(){gb_ = 1;}
+        void gb28181(){gb_ = 1;}
         void CPUDec(){cpu_ = 1;}
         void AudioSwitch(const bool a);
-        void SetRecMinCacheTime(const int mind);
+        void SetRecMinCacheTime(const int mind, const int maxd);
 
         int GetFPS(){return fps_;}
     public: //decoder
         void OpenDecoder();
-        void GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
+        int GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
     public: // push stream
         void CloseStream();
-        void GetPacket(unsigned char **pktData, int *size, int *key);
+        int GetPacket(unsigned char **pktData, int *size, int *key);
     public: // recorder
         void OpenRecorder();
+
+    public:
+        // set device id
+        int SetDevID(const int devid){ devid_ = devid; return 0;}
+
     private:
         // stream 鍙傛暟
         std::string input_url_;
         bool audio_;
-        int gb_, cpu_;
+        int gb_, cpu_, devid_;
         bool run_dec_;
         bool run_stream_;
         bool run_rec_;
+        bool work_start;
         // decoder 鍙傛暟
         std::unique_ptr<std::thread> thread_;
         std::atomic_bool    stop_stream_;
@@ -82,13 +88,16 @@
         std::function<void()> fn_rec_lazy_;
         bool logit_;
         int fps_;
+        // 涓哄吋瀹规枃浠惰В鐮佸仛鐨勮ˉ涓�
+        bool file_finished_;
+        int min_duration_;
     };
 
     void *CreateEncoder(const int w, const int h, const int fps, const int br, 
                         const int pix_fmt, const int scale_flag, const int gi);
     void DestroyEncoder(void *h);
     int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
-    int GetGb28181Pic(const char *filename, char *retData, int *retDataLen);
+    int GetGb28181Pic(const char *filename, char *retData, int *retDataLen, const int tt);
 }
 
 #endif
\ No newline at end of file

--
Gitblit v1.8.0