From 18a05d269516a5e33d8460291c2f93e73d95adce Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期二, 26 十二月 2023 10:45:31 +0800 Subject: [PATCH] GetYUV format is NV12 --- libcffmpeg.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index b1d010c..3fdb5f2 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -16,7 +16,7 @@ typedef void (*lib_cffmpeg_run)(const cffmpeg, const char*); typedef int (*lib_cffmpeg_fps)(const cffmpeg); typedef void (*lib_cffmpeg_gb28181)(const cffmpeg); -typedef char * (*lib_cffmpeg_get_gb28181_pic)(const char *rtspUrl, int *retDataLen); +typedef char * (*lib_cffmpeg_get_gb28181_pic)(const char *rtspUrl, int *retDataLen, const int); typedef void (*lib_cffmpeg_cpu)(const cffmpeg); typedef void (*lib_cffmpeg_open_recorder)(const cffmpeg); typedef void (*lib_cffmpeg_rec_duration)(const cffmpeg, const int, const int); @@ -28,6 +28,7 @@ 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*); +typedef int (*lib_cffmpeg_devid)(const cffmpeg, const int devid); typedef void(*lib_cffmpeg_release_buf) (void*); static lib_cffmpeg_create fn_create = NULL; @@ -47,7 +48,8 @@ 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; +static lib_cffmpeg_avpacket2 fn_get_avpacket2 = NULL; +static lib_cffmpeg_devid fn_set_devid = NULL; static lib_cffmpeg_release_buf fn_release_buf = NULL; typedef void* libcffmpeg; @@ -60,7 +62,7 @@ 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); -char * wrap_fn_get_gb28181_pic(void *lib, const char *rtspUrl, int *retDataLen); +char * wrap_fn_get_gb28181_pic(void *lib, const char *rtspUrl, int *retDataLen, const int tt); void wrap_fn_use_cpu(void *lib, const cffmpeg h); 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); @@ -72,6 +74,7 @@ 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); +int wrap_fn_set_devid(void *lib, const cffmpeg h, const int devid); void wrap_fn_release_buf(void *lib, void *buf); // for encoder -- Gitblit v1.8.0