From be9c1d1f659b0ff31f656424c478e83a4f7c53b5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 20 九月 2019 11:44:19 +0800
Subject: [PATCH] update ffmpeg

---
 cffmpeg.h |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/cffmpeg.h b/cffmpeg.h
index 6974816..a1d1473 100644
--- a/cffmpeg.h
+++ b/cffmpeg.h
@@ -9,9 +9,6 @@
 
 typedef void* cffmpeg;
 
-typedef void(*rec_func)(char*, int);
-typedef void(*dec_func)(void*,int,int);
-
 cffmpeg c_ffmpeg_create();
 void c_ffmpeg_destroy(const cffmpeg h);
 void c_ffmpeg_run(const cffmpeg h, const char *input);
@@ -20,20 +17,16 @@
 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);
+void c_ffmpeg_build_recorder(const cffmpeg h, const char*id, const char *dir, int mind, int maxd, int audio);
 void c_ffmpeg_fire_recorder(const cffmpeg h, const char*sid, const int64_t id);
-char* c_ffmpeg_get_info_recorder(const cffmpeg h, char **sid, int *index, int *length);
+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);
+void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int64_t *id);
 void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key);
-////////////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);
-
 
 //////test
-void* c_ffmpeg_decode_jpeg(const cffmpeg h, const char *file, int *wid, int *hei);
+void* c_ffmpeg_decode_jpeg(const char *file, 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);

--
Gitblit v1.8.0