From 602b3b2a792d65e49dba07920b100b5feb39d36f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 九月 2019 13:43:40 +0800
Subject: [PATCH] remove log

---
 libcffmpeg.h |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/libcffmpeg.h b/libcffmpeg.h
index eb92d66..cf8d212 100644
--- a/libcffmpeg.h
+++ b/libcffmpeg.h
@@ -10,9 +10,6 @@
 
 typedef void* cffmpeg;
 
-typedef void(*rec_func)(char*, int);
-typedef void(*dec_func)(void*,int,int);
-
 typedef cffmpeg(*lib_cffmpeg_create)();
 typedef void (*lib_cffmpeg_destroy)(const cffmpeg);
 typedef void (*lib_cffmpeg_run)(const cffmpeg, const char*);
@@ -21,13 +18,11 @@
 typedef void (*lib_cffmpeg_cpu)(const cffmpeg);
 typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, const char*, int, int);
 typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const char*, const int64_t);
-typedef char*(*lib_cffmpeg_info_recorder)(const cffmpeg, char**, int*, int*);
+typedef void (*lib_cffmpeg_info_recorder)(const cffmpeg, int*, char**, int*, char**, int*);
 typedef void (*lib_cffmpeg_decoder)(const cffmpeg);
-typedef void*(*lib_cffmpeg_pic)(const cffmpeg, int*, int*);
+typedef void*(*lib_cffmpeg_pic)(const cffmpeg, int*, int*, int64_t*);
 typedef void*(*lib_cffmpeg_avpacket)(const cffmpeg, int*, int*);
-typedef void (*lib_cffmpeg_active_recorder)(const cffmpeg, const char*, int, int, rec_func);
-typedef void (*lib_cffmpeg_active_decoder)(const cffmpeg, dec_func);
-typedef void*(*lib_cffmpeg_decode_jpeg)(const cffmpeg, const char*, int*, int*);
+typedef void*(*lib_cffmpeg_decode_jpeg)(const char*, int*, int*);
 
 static lib_cffmpeg_create              fn_create = NULL;
 static lib_cffmpeg_destroy             fn_destroy = NULL;
@@ -41,8 +36,6 @@
 static lib_cffmpeg_decoder             fn_decoder = NULL;
 static lib_cffmpeg_pic                 fn_decoder_pic = NULL;
 static lib_cffmpeg_avpacket            fn_get_avpacket = NULL;
-static lib_cffmpeg_active_recorder     fn_active_recorder = NULL;
-static lib_cffmpeg_active_decoder      fn_active_decoder = NULL;
 static lib_cffmpeg_decode_jpeg         fn_dec_jpeg = NULL;
 
 typedef void* libcffmpeg;
@@ -57,13 +50,11 @@
 void wrap_fn_use_cpu(const cffmpeg h);
 void wrap_fn_recorder(const cffmpeg h, const char* id, const char* dir, int mind, int maxd);
 void wrap_fn_fire_recorder(const cffmpeg h, const char *sid, const int64_t id);
-char* wrap_fn_info_recorder(const cffmpeg, char** sid, int* index, int* length);
+void wrap_fn_info_recorder(const cffmpeg, int* index, char** recid, int* recidLen, char** fpath, int* pathLen);
 void wrap_fn_decoder(const cffmpeg h);
-void* wrap_fn_decoder_pic(const cffmpeg h, int* wid, int* hei);
+void* wrap_fn_decoder_pic(const cffmpeg h, int* wid, int* hei, int64_t *id);
 void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key);
-void wrap_fn_active_recorder(const cffmpeg h, const char* dir, int mind, int maxd, rec_func fn);
-void wrap_fn_active_decoder(const cffmpeg h, dec_func fn);
-void* wrap_fn_decode_jpeg(const cffmpeg h, const char* file, int* wid, int* hei);
+void* wrap_fn_decode_jpeg(const char* file, int* wid, int* hei);
 
 
 // for encoder

--
Gitblit v1.8.0