From d0b8204e3939e1e2d841a90ea254bc4b91309ab5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期日, 19 一月 2020 13:32:13 +0800
Subject: [PATCH] update ffmepg gpu balance
---
csrc/cffmpeg.cpp | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 3a97159..fc92229 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,9 +62,20 @@
//////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);
+}
+
+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;
+
+ bool a = audio == 0 ? false : true;
+ s->BuildRecorder(id, dir, fid, mind, maxd, a);
}
void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
@@ -83,14 +108,19 @@
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){
+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, id);
+ s->GetPicDecoder(&data, wid, hei, format, length, id);
return data;
+}
+
+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 +130,9 @@
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;
-}
-
// 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