From 278634c0d2eeba9e3fcc3b4cd56ddfb3323277d7 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 10 三月 2020 10:08:20 +0800
Subject: [PATCH] compatible to local files

---
 csrc/cffmpeg.cpp |   77 +++++++++++++++++++++++++-------------
 1 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 3a97159..8d872c4 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,14 +33,26 @@
     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->GB28181();
+}
+
+char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen){
+    char * retData = (char *)malloc(sizeof(char) * 3000000);
+    int flag = GetGb28181Pic(rtspUrl, retData, retDataLen);
+    if(flag == -1){
+        free(retData);
+        *retDataLen = 0;
+        return NULL;
+    }
+
+    return retData;
 }
 
 void c_ffmepg_use_cpu(const cffmpeg h){
@@ -48,21 +62,32 @@
 
 
 //////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, int mind, int maxd){
+void c_ffmpeg_open_recorder(const cffmpeg h){
     Wrapper *s = (Wrapper*)h;
-    s->BuildRecorder(id, dir, mind, maxd);
+    s->OpenRecorder();
+}
+void c_ffmpeg_set_record_duration(const cffmpeg h, const int min, const int max){
+    Wrapper *s = (Wrapper*)h;
+    s->SetRecMinCacheTime(min, max);
 }
 
-void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, 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(sid, id);
+
+    bool a = audio == 0 ? false : true;
+    s->BuildRecorder(id, dir, fid, mind, maxd, a);
 }
 
-void c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen){
+int c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
+    Wrapper *s = (Wrapper*)h;
+    return s->FireRecorder(sid, id);
+}
+
+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());
 
@@ -79,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, 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, 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){
@@ -100,18 +129,14 @@
     return data;
 }
 
-/////////////////////test
-void* c_ffmpeg_decode_jpeg(const char *file, int *wid, int *hei){
-    uint8_t *p = DecodeJPEG(file, wid, hei);
-    if(!p){
-        *wid = *hei = 0;
-    }
-    return p;
+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);
 }
 
 // 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