From 080acae08ec8cfe413c3e6e45bcf7f9222dfa02d Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期四, 24 十月 2019 16:50:28 +0800 Subject: [PATCH] update --- libcffmpeg.h | 83 ++++++++++++++++++++++------------------- 1 files changed, 45 insertions(+), 38 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index 9867d44..7bc4998 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -10,68 +10,59 @@ typedef void* cffmpeg; -typedef void(*rec_func)(char*, int); -typedef void(*dec_func)(void*,int,int); - typedef cffmpeg(*lib_cffmpeg_create)(); +typedef cffmpeg(*lib_cffmpeg_create2)(const char*); 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 int (*lib_cffmpeg_fps)(const cffmpeg); 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_rec_duration)(const cffmpeg, const int, const int); +typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, const char*, const int64_t, int, 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_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*, 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)(const char*, const int, int*, int*); static lib_cffmpeg_create fn_create = NULL; +static lib_cffmpeg_create2 fn_create2 = 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_fps fn_fps = NULL; static lib_cffmpeg_gb28181 fn_gb28181 = NULL; static lib_cffmpeg_cpu fn_cpu = NULL; +static lib_cffmpeg_rec_duration fn_rec_duration = 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_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; +static lib_cffmpeg_decode fn_decode = NULL; typedef void* libcffmpeg; libcffmpeg init_libcffmpeg(const char *so_file); void release_libcffmpeg(libcffmpeg lib); -cffmpeg wrap_fn_create(); -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_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); -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); - - +cffmpeg wrap_fn_create(void *lib); +cffmpeg wrap_fn_create2(void *lib, const char *logfile); +void wrap_fn_destroy(void *lib, const cffmpeg h); +void wrap_fn_run(void *lib, const cffmpeg h, const char* input); +int wrap_fn_fps(void *lib, const cffmpeg h); +void wrap_fn_run_gb28181(void *lib, const cffmpeg h); +void wrap_fn_use_cpu(void *lib, const cffmpeg h); +void wrap_fn_rec_duration(void *lib, const cffmpeg h, const int min, const int max); +void wrap_fn_recorder(void *lib, const cffmpeg h, const char* id, const char* dir, const int64_t fid, int mind, int maxd, int audio); +void wrap_fn_fire_recorder(void *lib, const cffmpeg h, const char *sid, const int64_t id); +void wrap_fn_info_recorder(void *lib, const cffmpeg, int* index, char** recid, int* recidLen, char** fpath, int* pathLen); +void wrap_fn_decoder(void *lib, const cffmpeg h); +void* wrap_fn_decoder_pic(void *lib, const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id); +void* wrap_fn_get_avpacket(void *lib, const cffmpeg h, int* size, int* key); +void* wrap_fn_decode(void *lib, const char* file, const int gb, 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); @@ -80,9 +71,25 @@ 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); +cencoder wrap_fn_create_encoder(void *lib, const int w, const int h, const int fps, const int br, const int scale_flag, const int gi); +void wrap_fn_destroy_encoder(void *lib, const cencoder h); +void* wrap_fn_encode(void *lib, cencoder hdl, void *in, const int w, const int h, int *out_size, int *key); + + +// for conv +typedef void *cconv; +typedef cconv (*lib_cffmpeg_create_conv)(const int, const int, const int, const int, const int, const int, const int); +typedef void* (*lib_cffmpeg_conv)(const cconv, uint8_t *in); +typedef void (*lib_cffmpeg_destroy_conv)(const cconv); + +static lib_cffmpeg_create_conv fn_create_conv = NULL; +static lib_cffmpeg_destroy_conv fn_destroy_conv = NULL; +static lib_cffmpeg_conv fn_conv = NULL; + +cconv wrap_fn_create_conv(void *lib, const int srcW, const int srcH, const int srcFormat, + const int dstW, const int dstH, const int dstFormat, const int flag); +void wrap_fn_destroy_conv(void *lib, const cconv h); +void* wrap_fn_conv(void *lib, const cconv h, uint8_t *in); #ifdef __cplusplus } -- Gitblit v1.8.0