From 278634c0d2eeba9e3fcc3b4cd56ddfb3323277d7 Mon Sep 17 00:00:00 2001 From: 554325746@qq.com <554325746@qq.com> Date: 星期二, 10 三月 2020 10:08:20 +0800 Subject: [PATCH] compatible to local files --- libcffmpeg.h | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index 4ab0cea..d15ed21 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -21,12 +21,13 @@ typedef void (*lib_cffmpeg_open_recorder)(const cffmpeg); 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 void (*lib_cffmpeg_info_recorder)(const cffmpeg, int*, char**, int*, char**, int*); +typedef int (*lib_cffmpeg_fire_recorder)(const cffmpeg, const char*, const int64_t); +typedef int (*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*, int*, int*, int64_t*); +typedef int (*lib_cffmpeg_pic)(const cffmpeg, unsigned char**, int*, int*, int*, int*, int64_t*); typedef void (*lib_cffmpeg_close_stream)(const cffmpeg); typedef void*(*lib_cffmpeg_avpacket)(const cffmpeg, int*, int*); +typedef int (*lib_cffmpeg_avpacket2)(const cffmpeg, unsigned char**, int*, int*); static lib_cffmpeg_create fn_create = NULL; static lib_cffmpeg_create2 fn_create2 = NULL; @@ -45,6 +46,7 @@ static lib_cffmpeg_pic fn_decoder_pic = NULL; static lib_cffmpeg_close_stream fn_close_stream = NULL; static lib_cffmpeg_avpacket fn_get_avpacket = NULL; +static lib_cffmpeg_avpacket2 fn_get_avpacket2 = NULL; typedef void* libcffmpeg; libcffmpeg init_libcffmpeg(const char *so_file); @@ -61,12 +63,13 @@ void wrap_fn_open_rec(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); +int wrap_fn_fire_recorder(void *lib, const cffmpeg h, const char *sid, const int64_t id); +int 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); +int wrap_fn_decoder_pic(void *lib, const cffmpeg h, unsigned char** data, int *wid, int *hei, int *format, int *length, int64_t *id); void wrap_fn_close_stream(void *lib, const cffmpeg h); void* wrap_fn_get_avpacket(void *lib, const cffmpeg h, int* size, int* key); +int wrap_fn_get_avpacket2(void *lib, const cffmpeg h, unsigned char **data, int* size, int* key); // 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 pix_fmt, const int scale_flag, const int gi); -- Gitblit v1.8.0