From 68a19a73681301c6712e10d55bc64324716dbd24 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期三, 09 十月 2019 15:38:47 +0800 Subject: [PATCH] split scale --- libcffmpeg.h | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index 5b43da3..44d82b2 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -14,22 +14,21 @@ 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 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, 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*, int64_t*); +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_decode)(const char*, const int, int*, int*); +typedef void*(*lib_gpu_conv)(void*, const int, const int, const int, const 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_gb28181 fn_gb28181 = NULL; static lib_cffmpeg_cpu fn_cpu = NULL; static lib_cffmpeg_recorder fn_recorder = NULL; @@ -39,6 +38,7 @@ static lib_cffmpeg_pic fn_decoder_pic = NULL; static lib_cffmpeg_avpacket fn_get_avpacket = NULL; static lib_cffmpeg_decode fn_decode = NULL; +static lib_gpu_conv fn_gpu_conv = NULL; typedef void* libcffmpeg; libcffmpeg init_libcffmpeg(const char *so_file); @@ -48,21 +48,18 @@ cffmpeg wrap_fn_create2(const char *logfile); 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, int audio); 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, int64_t *id); +void* wrap_fn_decoder_pic(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id); void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key); void* wrap_fn_decode(const char* file, const int gb, int* wid, int* hei); - - +void* wran_fn_gpu_conv(void *in, const int w, const int h, const int dst_w, const int dst_h, int *length); // 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); @@ -75,6 +72,22 @@ 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); + +// for conv +typedef void *cconv; +typedef cconv (*lib_cffmpeg_create_conv)(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(const int srcW, const int srcH, const int srcFormat, + const int dstW, const int dstH, const int flag); +void wrap_fn_destroy_conv(const cconv h); +void* wrap_fn_conv(const cconv h, uint8_t *in); + #ifdef __cplusplus } #endif -- Gitblit v1.8.0