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.c | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index 626b83c..279b292 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -44,7 +44,7 @@
cffmpeg wrap_fn_create2(void *lib, const char *logfile){
if (!fn_create2){
- fn_create2 = (lib_cffmpeg_create)dlsym(lib, "c_ffmpeg_create2");
+ fn_create2 = (lib_cffmpeg_create2)dlsym(lib, "c_ffmpeg_create2");
release_if_err(fn_create2, lib);
}
return fn_create2(logfile);
@@ -79,7 +79,7 @@
fn_gb28181(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){
if (!fn_get_gb28181_pic){
fn_get_gb28181_pic = (lib_cffmpeg_get_gb28181_pic)dlsym(lib, "c_ffmpeg_get_gb28181_pic");
if(!fn_get_gb28181_pic) {
@@ -87,7 +87,7 @@
return NULL;
}
}
- return fn_get_gb28181_pic(rtspUrl, retDataLen);
+ return fn_get_gb28181_pic(rtspUrl, retDataLen, tt);
}
void wrap_fn_use_cpu(void *lib, const cffmpeg h){
@@ -125,7 +125,7 @@
int wrap_fn_fire_recorder(void *lib, const cffmpeg h, const char* sid, const int64_t id){
if (!fn_fire_recorder){
fn_fire_recorder = (lib_cffmpeg_fire_recorder)dlsym(lib, "c_ffmpeg_fire_recorder");
- if (!fn_fire_recorder) return;
+ if (!fn_fire_recorder) return -1;
}
return fn_fire_recorder(h, sid, id);
}
@@ -133,7 +133,7 @@
int wrap_fn_info_recorder(void *lib, const cffmpeg h, int* index, char** recid, int* recidLen, char** fpath, int* pathLen){
if (!fn_info_recorder){
fn_info_recorder = (lib_cffmpeg_info_recorder)dlsym(lib, "c_ffmpeg_get_info_recorder");
- if (!fn_info_recorder) return;
+ if (!fn_info_recorder) return -1;
}
return fn_info_recorder(h, index, recid, recidLen, fpath, pathLen);
}
@@ -149,7 +149,7 @@
int wrap_fn_decoder_pic(void *lib, const cffmpeg h, unsigned char** data, int *wid, int *hei, int *format, int *length, int64_t *id){
if (!fn_decoder_pic){
fn_decoder_pic = (lib_cffmpeg_pic)dlsym(lib, "c_ffmpeg_get_pic_decoder");
- release_if_err(fn_decoder_pic, lib);
+ if (!fn_decoder_pic) return -1;
}
return fn_decoder_pic(h, data, wid, hei, format, length, id);
}
@@ -173,10 +173,25 @@
int wrap_fn_get_avpacket2(void *lib, const cffmpeg h, unsigned char **data, int* size, int* key){
if(!fn_get_avpacket2){
fn_get_avpacket2 = (lib_cffmpeg_avpacket2)dlsym(lib, "c_ffmpeg_get_avpacket2");
- release_if_err(fn_get_avpacket2, lib);
+ if (!fn_get_avpacket2) return -1;
}
return fn_get_avpacket2(h, data, size, key);
}
+
+int wrap_fn_set_devid(void *lib, const cffmpeg h, const int devid){
+ if (!fn_set_devid){
+ fn_set_devid = (lib_cffmpeg_devid)dlsym(lib, "c_ffmpeg_set_devid");
+ if (!fn_set_devid) return -1;
+ }
+ return fn_set_devid(h, devid);
+}
+
+void wrap_fn_release_buf(void *lib, void *buf){
+ if (!fn_release_buf){
+ fn_release_buf = (lib_cffmpeg_release_buf)dlsym(lib, "c_ffmpeg_release_buf");
+ }
+ if (fn_release_buf) fn_release_buf(buf);
+}
// for encoder
cencoder wrap_fn_create_encoder(void *lib, const int w, const int h, const int fps, const int br, const int pix_fmt, const int scale_flag, const int gi){
if (!fn_create_encoder){
--
Gitblit v1.8.0