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 | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index f77b232..fc92229 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -43,6 +43,18 @@
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){
Wrapper *s = (Wrapper*)h;
s->CPUDec();
@@ -50,6 +62,10 @@
//////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);
@@ -92,7 +108,7 @@
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){
@@ -100,6 +116,11 @@
unsigned char *data = NULL;
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){
@@ -110,8 +131,8 @@
}
// 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