From 080acae08ec8cfe413c3e6e45bcf7f9222dfa02d Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 24 十月 2019 16:50:28 +0800
Subject: [PATCH] update

---
 cffmpeg.h |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/cffmpeg.h b/cffmpeg.h
index 93f1754..0a7ebd1 100644
--- a/cffmpeg.h
+++ b/cffmpeg.h
@@ -9,23 +9,26 @@
 
 typedef void* cffmpeg;
 
-cffmpeg c_ffmpeg_create(const int, const char *logfile);
+cffmpeg c_ffmpeg_create();
+cffmpeg c_ffmpeg_create2(const char *logfile);
+
 void c_ffmpeg_destroy(const cffmpeg h);
 void c_ffmpeg_run(const cffmpeg h, const char *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);
 void c_ffmpeg_run_gb28181(const cffmpeg h);
 void c_ffmepg_use_cpu(const cffmpeg h);
 /////////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, const char*id, const char *dir, int mind, int maxd, int audio);
+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);
 void c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen);
 
 void c_ffmpeg_build_decoder(const cffmpeg h);
-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);
 void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key);
 
-//////test
+//////decoder
 void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei);
 
 // pic encoder
@@ -33,6 +36,12 @@
 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
 }
 #endif

--
Gitblit v1.8.0