From c60d61c48c7a1e7b693d4c3f6427e3b616d1f471 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 21 十月 2019 12:29:33 +0800
Subject: [PATCH] update ffmpeg
---
libcffmpeg.c | 176 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 102 insertions(+), 74 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index 0486921..edc7b5c 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -17,58 +17,9 @@
libcffmpeg init_libcffmpeg(const char *so_file){
libcffmpeg lib = dlopen(so_file, RTLD_LAZY);
if(lib){
- fn_create = (lib_cffmpeg_create)dlsym(lib, "c_ffmpeg_create");
- release_if_err(fn_create, lib);
- fn_create2 = (lib_cffmpeg_create)dlsym(lib, "c_ffmpeg_create2");
- release_if_err(fn_create2, lib);
fn_destroy = (lib_cffmpeg_destroy)dlsym(lib, "c_ffmpeg_destroy");
release_if_err(fn_destroy, lib);
-
- fn_run = (lib_cffmpeg_run)dlsym(lib, "c_ffmpeg_run");
- release_if_err(fn_run, lib);
- fn_gb28181 = (lib_cffmpeg_gb28181)dlsym(lib, "c_ffmpeg_run_gb28181");
- release_if_err(fn_gb28181, lib);
-
- fn_cpu = (lib_cffmpeg_cpu)dlsym(lib, "c_ffmepg_use_cpu");
- release_if_err(fn_cpu, lib);
-
- fn_rec_duration = (lib_cffmpeg_rec_duration)dlsym(lib, "c_ffmpeg_set_record_duration");
- release_if_err(fn_rec_duration, lib);
- fn_recorder = (lib_cffmpeg_recorder)dlsym(lib, "c_ffmpeg_build_recorder");
- release_if_err(fn_recorder, lib);
- fn_fire_recorder = (lib_cffmpeg_fire_recorder)dlsym(lib, "c_ffmpeg_fire_recorder");
- release_if_err(fn_fire_recorder, lib);
- fn_info_recorder = (lib_cffmpeg_info_recorder)dlsym(lib, "c_ffmpeg_get_info_recorder");
- release_if_err(fn_info_recorder, lib);
-
- fn_decoder = (lib_cffmpeg_decoder)dlsym(lib, "c_ffmpeg_build_decoder");
- release_if_err(fn_decoder, lib);
- fn_decoder_pic = (lib_cffmpeg_pic)dlsym(lib, "c_ffmpeg_get_pic_decoder");
- release_if_err(fn_decoder_pic, lib);
-
- fn_get_avpacket = (lib_cffmpeg_avpacket)dlsym(lib, "c_ffmpeg_get_avpacket");
- release_if_err(fn_get_avpacket, lib);
-
- fn_decode = (lib_cffmpeg_decode)dlsym(lib, "c_ffmpeg_decode");
- release_if_err(fn_decode, lib);
-
- fn_create_encoder = (lib_cffmpeg_create_encoder)dlsym(lib, "c_ffmpeg_create_encoder");
- release_if_err(fn_create_encoder, lib);
- fn_destroy_encoder = (lib_cffmpeg_destroy_encoder)dlsym(lib, "c_ffmpeg_destroy_encoder");
- release_if_err(fn_destroy_encoder, lib);
- fn_encode = (lib_cffmpeg_encode)dlsym(lib, "c_ffmpeg_encode");
- release_if_err(fn_encode, lib);
-
- fn_create_conv = (lib_cffmpeg_create_conv)dlsym(lib, "c_ffmpeg_create_conv");
- release_if_err(fn_create_conv, lib);
- fn_destroy_conv = (lib_cffmpeg_destroy_conv)dlsym(lib, "c_ffmpeg_destroy_conv");
- release_if_err(fn_destroy_conv, lib);
- fn_conv = (lib_cffmpeg_conv)dlsym(lib, "c_ffmpeg_conv");
- release_if_err(fn_conv, lib);
-
- fn_gpu_conv = (lib_gpu_conv)dlsym(lib, "c_gpu_conv");
- release_if_err(fn_gpu_conv, lib);
}else{
printf("dlopen - %s\n", dlerror());
@@ -82,77 +33,140 @@
}
}
-cffmpeg wrap_fn_create(){
+cffmpeg wrap_fn_create(void *lib){
+ if (!fn_create){
+ fn_create = (lib_cffmpeg_create)dlsym(lib, "c_ffmpeg_create");
+ release_if_err(fn_create, lib);
+ }
+
return fn_create();
}
-cffmpeg wrap_fn_create2(const char *logfile){
+cffmpeg wrap_fn_create2(void *lib, const char *logfile){
+ if (!fn_create2){
+ fn_create2 = (lib_cffmpeg_create)dlsym(lib, "c_ffmpeg_create2");
+ release_if_err(fn_create2, lib);
+ }
return fn_create2(logfile);
}
-void wrap_fn_destroy(const cffmpeg h){
+void wrap_fn_destroy(void *lib, const cffmpeg h){
fn_destroy(h);
}
-void wrap_fn_run(const cffmpeg h, const char* input){
+void wrap_fn_run(void *lib, const cffmpeg h, const char* input){
+ if (!fn_run){
+ fn_run = (lib_cffmpeg_run)dlsym(lib, "c_ffmpeg_run");
+ if (!fn_run) return;
+ }
+
fn_run(h, input);
}
-void wrap_fn_run_gb28181(const cffmpeg h){
+void wrap_fn_run_gb28181(void *lib, const cffmpeg h){
+ if (!fn_gb28181){
+ fn_gb28181 = (lib_cffmpeg_gb28181)dlsym(lib, "c_ffmpeg_run_gb28181");
+ if (!fn_gb28181) return;
+ }
fn_gb28181(h);
}
-void wrap_fn_use_cpu(const cffmpeg h){
+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_recorder(const cffmpeg h, const char* id, const char* dir, int mind, int maxd, int audio){
- fn_recorder(h, id, dir, mind, maxd, audio);
+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){
+ if (!fn_recorder){
+ fn_recorder = (lib_cffmpeg_recorder)dlsym(lib, "c_ffmpeg_build_recorder");
+ if (!fn_recorder) return;
+ }
+ fn_recorder(h, id, dir, fid, mind, maxd, audio);
}
-void wrap_fn_rec_duration(const cffmpeg h, const int min, const int max){
+void wrap_fn_rec_duration(void *lib, const cffmpeg h, const int min, const int max){
+ if (!fn_rec_duration){
+ fn_rec_duration = (lib_cffmpeg_rec_duration)dlsym(lib, "c_ffmpeg_set_record_duration");
+ if (!fn_rec_duration) return;
+ }
fn_rec_duration(h, min, max);
}
-void wrap_fn_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
+void 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;
+ }
fn_fire_recorder(h, sid, id);
}
-void wrap_fn_info_recorder(const cffmpeg h, int* index, char** recid, int* recidLen, char** fpath, int* pathLen){
+void 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;
+ }
return fn_info_recorder(h, index, recid, recidLen, fpath, pathLen);
}
-void wrap_fn_decoder(const cffmpeg h){
+void wrap_fn_decoder(void *lib, const cffmpeg h){
+ if (!fn_decoder){
+ fn_decoder = (lib_cffmpeg_decoder)dlsym(lib, "c_ffmpeg_build_decoder");
+ if (!fn_decoder) return;
+ }
fn_decoder(h);
}
-void* wrap_fn_decoder_pic(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id){
+void* wrap_fn_decoder_pic(void *lib, const cffmpeg h, 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);
+ }
return fn_decoder_pic(h, wid, hei, format, length, id);
}
-void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key){
+void* wrap_fn_get_avpacket(void *lib, const cffmpeg h, int* size, int* key){
+ if(!fn_get_avpacket){
+ fn_get_avpacket = (lib_cffmpeg_avpacket)dlsym(lib, "c_ffmpeg_get_avpacket");
+ release_if_err(fn_get_avpacket, lib);
+ }
return fn_get_avpacket(h, size, key);
}
// return val: -1 open error; -2, find stream error; -3, converter create error
-void* wrap_fn_decode(const char* file, const int gb, int* wid, int* hei){
+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);
+ }
return fn_decode(file, gb, wid, hei);
}
-void* wran_fn_gpu_conv(void *in, const int w, const int h, const int dst_w, const int dst_h, int *length){
- return fn_gpu_conv(in, w, h, dst_w, dst_h, length);
-}
-
// for encoder
-cencoder wrap_fn_create_encoder(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 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);
}
-void wrap_fn_destroy_encoder(const cencoder h){
+void wrap_fn_destroy_encoder(void *lib, const cencoder h){
+ if (!fn_destroy_encoder){
+ fn_destroy_encoder = (lib_cffmpeg_destroy_encoder)dlsym(lib, "c_ffmpeg_destroy_encoder");
+ if(!fn_destroy_encoder) return;
+ }
fn_destroy_encoder(h);
}
-void* wrap_fn_encode(cencoder hdl, void *in, const int w, const int h, int *out_size, int *key){
+void* wrap_fn_encode(void *lib, cencoder hdl, void *in, const int w, const int h, int *out_size, int *key){
+ if (!fn_encode){
+ fn_encode = (lib_cffmpeg_encode)dlsym(lib, "c_ffmpeg_encode");
+ release_if_err(fn_encode, lib);
+ }
+
uint8_t *out = NULL;
const int flag = fn_encode(hdl, (uint8_t*)in, w, h, &out, out_size, key);
if (flag > 0 && out != NULL) {
@@ -164,14 +178,28 @@
}
// for conv
-cconv wrap_fn_create_conv(const int srcW, const int srcH, const int srcFormat,
+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(const cconv h){
+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(const cconv h, uint8_t *in){
+
+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