From d2bec7c45f71a12734b359f10bda6302ecd8a657 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 29 七月 2019 11:49:22 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg

---
 cffmpeg.h |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cffmpeg.h b/cffmpeg.h
index f992654..ef4ed72 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,17 +17,14 @@
 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 *dir, int mind, int maxd);
-void c_ffmpeg_fire_recorder(const cffmpeg h, const int64_t id);
+void c_ffmpeg_build_recorder(const cffmpeg h, const char*id, const char *dir, int mind, int maxd);
+void c_ffmpeg_fire_recorder(const cffmpeg h, const char*sid, const int64_t id);
 char* c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, int *length);
+char* c_ffmpeg_get_rec_id(const cffmpeg h, const char* p, int *length);
 
 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_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);

--
Gitblit v1.8.0