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 --- libcffmpeg.h | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index 1cfbaa5..7c31723 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -10,23 +10,19 @@ 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_gb28181)(const cffmpeg); typedef void (*lib_cffmpeg_cpu)(const cffmpeg); -typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, int, int); -typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const int64_t); +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, int*, int*); +typedef char*(*lib_cffmpeg_rec_id)(const cffmpeg, const char*, int*); typedef void (*lib_cffmpeg_decoder)(const cffmpeg); typedef void*(*lib_cffmpeg_pic)(const cffmpeg, int*, int*); 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*); static lib_cffmpeg_create fn_create = NULL; @@ -38,11 +34,10 @@ 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_rec_id fn_rec_id = NULL; 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; @@ -55,14 +50,13 @@ void wrap_fn_scale(const cffmpeg h, const int wid, const int hei, const int flags); 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* 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_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, int* index, int* length); +char* wrap_fn_rec_id(const cffmpeg h, const char* path, int*length); void wrap_fn_decoder(const cffmpeg h); void* wrap_fn_decoder_pic(const cffmpeg h, int* wid, int* hei); 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); -- Gitblit v1.8.0