From 247da74f27e3020cb54b3106e3c2153c83d88e27 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 21 十一月 2019 15:23:10 +0800
Subject: [PATCH] update

---
 csrc/cffmpeg.cpp |   92 ++++++++++++++++++++--------------------------
 1 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 433a8ae..f42d753 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -10,15 +10,17 @@
 }
 #endif
 
-#ifndef LIB_CFFMPEG
-#include "csrc/all.hpp"
-#endif
 #include "csrc/wrapper.hpp"
 
 using namespace cffmpeg_wrap;
 
 cffmpeg c_ffmpeg_create(){
-    return new Wrapper;
+    
+    return new Wrapper();
+}
+
+cffmpeg c_ffmpeg_create2(const char *logfile){
+    return new Wrapper(logfile);
 }
 
 void c_ffmpeg_destroy(const cffmpeg h){
@@ -31,48 +33,61 @@
     s->RunStream(input);
 }
 
-void c_ffmpeg_scale(const cffmpeg h, const int wid, const int hei, const int flags){
+int c_ffmpeg_get_fps(const cffmpeg h){
     Wrapper *s = (Wrapper*)h;
-    s->ScalePicture(wid, hei, flags);
+    return s->GetFPS();
 }
 
 void c_ffmpeg_run_gb28181(const cffmpeg h){
     Wrapper *s = (Wrapper*)h;
-    s->UseGB28181();
+    s->GB28181();
 }
 
 void c_ffmepg_use_cpu(const cffmpeg h){
     Wrapper *s = (Wrapper*)h;
-    s->UseCPU();
+    s->CPUDec();
 }
 
 
 //////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, const char *dir, int mind, int maxd){
+void c_ffmpeg_set_record_duration(const cffmpeg h, const int min, const int max){
     Wrapper *s = (Wrapper*)h;
-    s->BuildRecorder(dir, mind, maxd);
+    s->SetRecMinCacheTime(min);
 }
 
-void c_ffmpeg_fire_recorder(const cffmpeg h, const int64_t id){
+void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, const int64_t fid, int mind, int maxd, int audio){
     Wrapper *s = (Wrapper*)h;
-    s->FireRecorder(id);
+
+    bool a = audio == 0 ? false : true;
+    s->BuildRecorder(id, dir, fid, mind, maxd, a);
 }
 
-char* c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, int *length){
+void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
+    Wrapper *s = (Wrapper*)h;
+    s->FireRecorder(sid, id);
+}
+
+void 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;
-    s->GetInfoRecorder(i, p);
+    std::string p(""), id("");
+    s->GetInfoRecorder(id, i, p);
 
-    // printf("cffmpeg get info : index : %d, file : %s\n", i, p.c_str());
+    // printf("cffmpeg get info : index : %d, file : %s, recid: %s\n", i, p.c_str(), id.c_str());
 
     *index = i;
-    *length = p.length();
-    char *path = (char*)malloc(*length + 1);
-    memcpy(path, p.c_str(), *length);
-    path[*length] = '\0';
+    
+    *pathLen = p.length();
+    char *path = (char*)malloc(*pathLen + 1);
+    memcpy(path, p.c_str(), *pathLen);
+    path[*pathLen] = '\0';
+    *fpath = path;
 
-    return path;
+    *recidLen = id.length();
+    char *rid = (char*)malloc(*recidLen + 1);
+    memcpy(rid, id.c_str(), *recidLen);
+    rid[*recidLen] = '\0';
+    *recid = rid;    
 }
 
 void c_ffmpeg_build_decoder(const cffmpeg h){
@@ -80,10 +95,10 @@
     s->BuildDecoder();
 }
 
-void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei){
+void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id){
     Wrapper *s = (Wrapper*)h;
     unsigned char *data = NULL;
-    s->GetPicDecoder(&data, wid, hei);
+    s->GetPicDecoder(&data, wid, hei, format, length, id);
     return data;
 }
 
@@ -93,37 +108,10 @@
     s->GetPacket(&data, size, key);
     return data;
 }
-/////////////////////active api
-void c_ffmpeg_active_recorder(const cffmpeg h, const char *dir, int mind, int maxd, 
-                                    rec_func fn){
-    Wrapper *s = (Wrapper*)h;
-
-    s->ActiveRecorder(dir, mind, maxd,[fn](std::string &p, int &i){
-        fn((char*)p.c_str(), i);
-    });
-}
-
-void c_ffmpeg_active_decoder(const cffmpeg h, dec_func fn){
-    Wrapper *s = (Wrapper*)h;
-    s->ActiveDecoder([fn](void* d, int wid, int hei){
-        fn(d, wid, hei);
-    });
-}
-
-
-/////////////////////test
-void* c_ffmpeg_decode_jpeg(const cffmpeg h, const char *file, int *wid, int *hei){
-    Wrapper *s = (Wrapper*)h;
-    uint8_t *p = s->decodeJPEG(file, wid, hei);
-    if(!p){
-        *wid = *hei = 0;
-    }
-    return p;
-}
 
 // 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){

--
Gitblit v1.8.0