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 | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 45 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index 7c30caf..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,12 +79,31 @@
fn_gb28181(h);
}
+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) {
+ *retDataLen = 0;
+ return NULL;
+ }
+ }
+ return fn_get_gb28181_pic(rtspUrl, retDataLen, tt);
+}
+
void wrap_fn_use_cpu(void *lib, const cffmpeg h){
if (!fn_cpu){
fn_cpu = (lib_cffmpeg_cpu)dlsym(lib, "c_ffmepg_use_cpu");
if (!fn_cpu) return;
}
fn_cpu(h);
+}
+
+void wrap_fn_open_rec(void *lib, const cffmpeg h){
+ if (!fn_open_recorder){
+ fn_open_recorder = (lib_cffmpeg_open_recorder)dlsym(lib, "c_ffmpeg_open_recorder");
+ if (!fn_open_recorder) return;
+ }
+ fn_open_recorder(h);
}
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){
@@ -103,18 +122,18 @@
fn_rec_duration(h, min, max);
}
-void wrap_fn_fire_recorder(void *lib, const cffmpeg h, const char* sid, const int64_t id){
+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;
}
- fn_fire_recorder(h, sid, id);
+ return fn_fire_recorder(h, sid, id);
}
-void wrap_fn_info_recorder(void *lib, const cffmpeg h, int* index, char** recid, int* recidLen, char** fpath, int* pathLen){
+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);
}
@@ -127,12 +146,20 @@
fn_decoder(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){
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, wid, hei, format, length, id);
+ return fn_decoder_pic(h, data, wid, hei, format, length, id);
+}
+
+void wrap_fn_close_stream(void *lib, const cffmpeg h){
+ if (!fn_close_stream){
+ fn_close_stream = (lib_cffmpeg_close_stream)dlsym(lib, "c_ffmpeg_close_stream");
+ if (!fn_close_stream) return;
+ }
+ fn_close_stream(h);
}
void* wrap_fn_get_avpacket(void *lib, const cffmpeg h, int* size, int* key){
@@ -143,22 +170,35 @@
return fn_get_avpacket(h, size, key);
}
-// return val: -1 open error; -2, find stream error; -3, converter create error
-void* wrap_fn_decode(void *lib, const char* file, const int gb, int* wid, int* hei){
- if (!fn_decode){
- fn_decode = (lib_cffmpeg_decode)dlsym(lib, "c_ffmpeg_decode");
- release_if_err(fn_decode, lib);
+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");
+ if (!fn_get_avpacket2) return -1;
}
- return fn_decode(file, gb, wid, hei);
+ 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 scale_flag, const int gi){
+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){
fn_create_encoder = (lib_cffmpeg_create_encoder)dlsym(lib, "c_ffmpeg_create_encoder");
release_if_err(fn_create_encoder, lib);
}
- return fn_create_encoder(w, h, fps, br, scale_flag, gi);
+ return fn_create_encoder(w, h, fps, br, pix_fmt, scale_flag, gi);
}
void wrap_fn_destroy_encoder(void *lib, const cencoder h){
@@ -177,37 +217,10 @@
uint8_t *out = NULL;
const int flag = fn_encode(hdl, (uint8_t*)in, w, h, &out, out_size, key);
- if (flag > 0 && out != NULL) {
+ if (flag == 0 && out != NULL) {
return out;
}
*out_size = 0;
*key = 0;
return NULL;
-}
-
-// for conv
-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){
- if (!fn_create_conv){
- fn_create_conv = (lib_cffmpeg_create_conv)dlsym(lib, "c_ffmpeg_create_conv");
- release_if_err(fn_create_conv, lib);
- }
- return fn_create_conv(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flag);
-}
-
-void wrap_fn_destroy_conv(void *lib, const cconv h){
- if (!fn_destroy_conv){
- fn_destroy_conv = (lib_cffmpeg_destroy_conv)dlsym(lib, "c_ffmpeg_destroy_conv");
- if(!fn_destroy_conv) return;
- }
- fn_destroy_conv(h);
-}
-
-void* wrap_fn_conv(void *lib, const cconv h, uint8_t *in){
- if (!fn_conv){
- fn_conv = (lib_cffmpeg_conv)dlsym(lib, "c_ffmpeg_conv");
- release_if_err(fn_conv, lib);
- }
-
- return fn_conv(h, in);
}
--
Gitblit v1.8.0