From a8b447be656145c9ba2a2d8319a10ae8f726de1f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 09 十月 2020 18:20:46 +0800
Subject: [PATCH] h264 mp4

---
 cffmpeg.h |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/cffmpeg.h b/cffmpeg.h
index c7bf9d1..1eb38cb 100644
--- a/cffmpeg.h
+++ b/cffmpeg.h
@@ -9,33 +9,35 @@
 
 typedef void* cffmpeg;
 
-typedef void(*rec_func)(char*, int);
-typedef void(*dec_func)(void*,int,int);
-
 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);
+char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen);
 void c_ffmepg_use_cpu(const cffmpeg h);
 /////////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, const char *dir, int mind, int maxd);
-void c_ffmpeg_fire_recorder(const cffmpeg h, const int64_t id);
-char* c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, int *length);
+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);
+int c_ffmpeg_fire_recorder(const cffmpeg h, const char*sid, const int64_t id);
+int 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);
-////////////active api
-void c_ffmpeg_active_recorder(const cffmpeg h, const char *dir, int mind, int maxd, rec_func fn);
-void c_ffmpeg_active_decoder(const cffmpeg h, dec_func fn);
+int c_ffmpeg_get_pic_decoder(const cffmpeg h, unsigned char **data, 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);
+int c_ffmpeg_get_avpacket2(const cffmpeg h, unsigned char **data, int *size, int *key);
 
+int c_ffmpeg_set_devid(const cffmpeg h, const int devid);
 
-//////test
-void* c_ffmpeg_decode_jpeg(const cffmpeg h, const char *file, int *wid, int *hei);
+void c_ffmpeg_release_buf(void* buf);
 
 // 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);
 

--
Gitblit v1.8.0