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 |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/libcffmpeg.h b/libcffmpeg.h
index ee54ead..cf8d212 100644
--- a/libcffmpeg.h
+++ b/libcffmpeg.h
@@ -10,33 +10,32 @@
 
 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*);
 typedef void (*lib_cffmpeg_scale)(const cffmpeg, const int, const int, const int);
-typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, int, int);
-typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const int64_t);
-typedef char*(*lib_cffmpeg_info_recorder)(const cffmpeg, int*, int*);
+typedef void (*lib_cffmpeg_gb28181)(const cffmpeg);
+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 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_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_pic)(const cffmpeg, int*, int*, int64_t*);
+typedef void*(*lib_cffmpeg_avpacket)(const cffmpeg, 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;
 static lib_cffmpeg_run                 fn_run = NULL;
 static lib_cffmpeg_scale               fn_scale = NULL;
+static lib_cffmpeg_gb28181             fn_gb28181 = NULL;
+static lib_cffmpeg_cpu                 fn_cpu = NULL;
 static lib_cffmpeg_recorder            fn_recorder = NULL;
 static lib_cffmpeg_fire_recorder       fn_fire_recorder = NULL;
 static lib_cffmpeg_info_recorder       fn_info_recorder = NULL;
 static lib_cffmpeg_decoder             fn_decoder = NULL;
 static lib_cffmpeg_pic                 fn_decoder_pic = NULL;
-static lib_cffmpeg_active_recorder     fn_active_recorder = NULL;
-static lib_cffmpeg_active_decoder      fn_active_decoder = NULL;
+static lib_cffmpeg_avpacket            fn_get_avpacket = NULL;
 static lib_cffmpeg_decode_jpeg         fn_dec_jpeg = NULL;
 
 typedef void* libcffmpeg;
@@ -47,14 +46,31 @@
 void wrap_fn_destroy(const cffmpeg h);
 void wrap_fn_run(const cffmpeg h, const char* input);
 void wrap_fn_scale(const cffmpeg h, const int wid, const int hei, const int flags);
-void wrap_fn_recorder(const cffmpeg h, const char* dir, int mind, int maxd);
-void wrap_fn_fire_recorder(const cffmpeg h, const int64_t id);
-char* wrap_fn_info_recorder(const cffmpeg, int*, int*);
+void wrap_fn_run_gb28181(const cffmpeg h);
+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);
+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_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_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_decode_jpeg(const char* file, int* wid, int* hei);
+
+
+// for encoder
+typedef void* cencoder;
+
+typedef cencoder (*lib_cffmpeg_create_encoder)(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
+typedef void (*lib_cffmpeg_destroy_encoder)(cencoder h);
+typedef int (*lib_cffmpeg_encode)(cencoder hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
+
+static lib_cffmpeg_create_encoder fn_create_encoder = NULL;
+static lib_cffmpeg_destroy_encoder fn_destroy_encoder = NULL;
+static lib_cffmpeg_encode fn_encode = NULL;
+
+cencoder wrap_fn_create_encoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
+void wrap_fn_destroy_encoder(const cencoder h);
+void* wrap_fn_encode(cencoder hdl, void *in, const int w, const int h, int *out_size, int *key);
 
 #ifdef __cplusplus
 }

--
Gitblit v1.8.0