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

---
 cffmpeg.h |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/cffmpeg.h b/cffmpeg.h
index 8f8abeb..4d7d65e 100644
--- a/cffmpeg.h
+++ b/cffmpeg.h
@@ -15,9 +15,12 @@
 void c_ffmpeg_destroy(const cffmpeg h);
 void c_ffmpeg_run(const cffmpeg h, const char *input);
 
+int c_ffmpeg_get_fps(const cffmpeg h);
 void c_ffmpeg_run_gb28181(const cffmpeg h);
+char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen);
 void c_ffmepg_use_cpu(const cffmpeg h);
 /////////passive api
+void c_ffmpeg_open_recorder(const cffmpeg h);
 void c_ffmpeg_set_record_duration(const cffmpeg h, const int min, const int 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);
 void c_ffmpeg_fire_recorder(const cffmpeg h, const char*sid, const int64_t id);
@@ -25,21 +28,13 @@
 
 void c_ffmpeg_build_decoder(const cffmpeg h);
 void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id);
+void c_ffmpeg_close_stream(const cffmpeg h);
 void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key);
 
-//////decoder
-void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei);
-
 // 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);
+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);
 void c_ffmpeg_destroy_encoder(void *h);
 int c_ffmpeg_encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
-
-// conv cpu
-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);
-void c_ffmpeg_destroy_conv(void *h);
-void *c_ffmpeg_conv(void *h, uint8_t *in);
 
 #ifdef __cplusplus
 }

--
Gitblit v1.8.0