From 8e1abcf7787bef797de15e92521fa14df2865c21 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 17:10:18 +0800
Subject: [PATCH] get stream with 200ms every times

---
 csrc/cffmpeg.cpp |   66 ++++++++++++++++++---------------
 1 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 029816d..b343ef4 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -43,9 +43,9 @@
     s->GB28181();
 }
 
-char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen){
+char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen, const int tt){
     char * retData = (char *)malloc(sizeof(char) * 3000000);
-    int flag = GetGb28181Pic(rtspUrl, retData, retDataLen);
+    int flag = GetGb28181Pic(rtspUrl, retData, retDataLen, tt);
     if(flag == -1){
         free(retData);
         *retDataLen = 0;
@@ -62,9 +62,13 @@
 
 
 //////passive api
+void c_ffmpeg_open_recorder(const cffmpeg h){
+    Wrapper *s = (Wrapper*)h;
+    s->OpenRecorder();
+}
 void c_ffmpeg_set_record_duration(const cffmpeg h, const int min, const int max){
     Wrapper *s = (Wrapper*)h;
-    s->SetRecMinCacheTime(min);
+    s->SetRecMinCacheTime(min, max);
 }
 
 void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, const int64_t fid, int mind, int maxd, int audio){
@@ -74,16 +78,16 @@
     s->BuildRecorder(id, dir, fid, mind, maxd, a);
 }
 
-void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
+int c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
     Wrapper *s = (Wrapper*)h;
-    s->FireRecorder(sid, id);
+    return s->FireRecorder(sid, id);
 }
 
-void c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen){
+int c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen){
     Wrapper *s = (Wrapper*)h;
     int i;
     std::string p(""), id("");
-    s->GetInfoRecorder(id, i, p);
+    int ret = s->GetInfoRecorder(id, i, p);
 
     // printf("cffmpeg get info : index : %d, file : %s, recid: %s\n", i, p.c_str(), id.c_str());
 
@@ -100,18 +104,22 @@
     memcpy(rid, id.c_str(), *recidLen);
     rid[*recidLen] = '\0';
     *recid = rid;    
+    return ret;
 }
 
 void c_ffmpeg_build_decoder(const cffmpeg h){
     Wrapper *s = (Wrapper*)h;
-    s->BuildDecoder();
+    s->OpenDecoder();
 }
 
-void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id){
+int c_ffmpeg_get_pic_decoder(const cffmpeg h, unsigned char **data, int *wid, int *hei, int *format, int *length, int64_t *id){
     Wrapper *s = (Wrapper*)h;
-    unsigned char *data = NULL;
-    s->GetPicDecoder(&data, wid, hei, format, length, id);
-    return data;
+    return s->GetPicDecoder(data, wid, hei, format, length, id);
+}
+
+void c_ffmpeg_close_stream(const cffmpeg h){
+    Wrapper *s = (Wrapper*)h;
+    s->CloseStream();
 }
 
 void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key){
@@ -121,14 +129,25 @@
     return data;
 }
 
-/////////////////////test
-void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei){
-    return Decode(file, gb, wid, hei);
+int c_ffmpeg_get_avpacket2(const cffmpeg h, unsigned char **data, int *size, int *key){
+    Wrapper *s = (Wrapper*)h;
+    return s->GetPacket(data, size, key);
+}
+
+int c_ffmpeg_set_devid(const cffmpeg h, const int devid){
+    Wrapper *s = (Wrapper*)h;
+    return s->SetDevID(devid);
+}
+
+void c_ffmpeg_release_buf(void* buf){
+    if (buf){
+        free(buf);
+    }
 }
 
 // pic encoder
-void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi){
-    return CreateEncoder(w, h, fps, br, scale_flag, gi);
+void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int pix_fmt, const int scale_flag, const int gi){
+    return CreateEncoder(w, h, fps, br, pix_fmt, scale_flag, gi);
 }
 
 void c_ffmpeg_destroy_encoder(void *h){
@@ -137,17 +156,4 @@
 
 int c_ffmpeg_encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key){
     return Encode(hdl, in, w, h, out, size, key);
-}
-
-void *c_ffmpeg_create_conv(const int srcW, const int srcH, const int srcFormat,
-                          const int dstW, const int dstH, const int dstFormat, const int flag){
-    return CreateConvertor(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flag);
-}
-
-void *c_ffmpeg_conv(void *h, uint8_t *in){
-    return Convert(h, in);
-}
-
-void c_ffmpeg_destroy_conv(void *h){
-    DestoryConvertor(h);
 }

--
Gitblit v1.8.0