From 2d4b871401ace5a54eaff1cbfacd008c586ad928 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 05 八月 2019 10:32:51 +0800
Subject: [PATCH] fix thread quit
---
libcffmpeg.c | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index cb9edf7..6cb7e5a 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -25,22 +25,34 @@
release_if_err(fn_run, lib);
fn_scale = (lib_cffmpeg_scale)dlsym(lib, "c_ffmpeg_scale");
release_if_err(fn_scale, 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_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_rec_id = (lib_cffmpeg_rec_id)dlsym(lib, "c_ffmpeg_get_rec_id");
+ release_if_err(fn_rec_id, 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_active_recorder = (lib_cffmpeg_active_recorder)dlsym(lib, "c_ffmpeg_active_recorder");
- release_if_err(fn_active_recorder, lib);
- fn_active_decoder = (lib_cffmpeg_active_decoder)dlsym(lib, "c_ffmpeg_active_decoder");
- release_if_err(fn_active_decoder, lib);
+ fn_get_avpacket = (lib_cffmpeg_avpacket)dlsym(lib, "c_ffmpeg_get_avpacket");
+ release_if_err(fn_get_avpacket, lib);
fn_dec_jpeg = (lib_cffmpeg_decode_jpeg)dlsym(lib, "c_ffmpeg_decode_jpeg");
release_if_err(fn_dec_jpeg, 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);
+
}else{
printf("dlopen - %s\n", dlerror());
}
@@ -69,34 +81,62 @@
fn_scale(h, wid, hei, flags);
}
-void wrap_fn_recorder(const cffmpeg h, const char* dir, int mind, int maxd){
- fn_recorder(h, dir, mind, maxd);
+void wrap_fn_run_gb28181(const cffmpeg h){
+ fn_gb28181(h);
}
-void wrap_fn_fire_recorder(const cffmpeg h, const int64_t id){
- fn_fire_recorder(h, id);
+void wrap_fn_use_cpu(const cffmpeg h){
+ fn_cpu(h);
+}
+
+void wrap_fn_recorder(const cffmpeg h, const char* id, const char* dir, int mind, int maxd){
+ fn_recorder(h, id, dir, mind, maxd);
+}
+
+void wrap_fn_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
+ fn_fire_recorder(h, sid, id);
}
char* wrap_fn_info_recorder(const cffmpeg h, int* index, int* length){
return fn_info_recorder(h, index, length);
}
+char* wrap_fn_rec_id(const cffmpeg h, const char* path, int*length){
+ return fn_rec_id(h, path, length);
+}
+
void wrap_fn_decoder(const cffmpeg h){
fn_decoder(h);
}
-void* wrap_fn_decoder_pic(const cffmpeg h, int* wid, int* hei){
- return fn_decoder_pic(h, wid, hei);
+void* wrap_fn_decoder_pic(const cffmpeg h, int* wid, int* hei, int64_t *id){
+ return fn_decoder_pic(h, wid, hei, id);
}
-void wrap_fn_active_recorder(const cffmpeg h, const char* dir, int mind, int maxd, rec_func fn){
- fn_active_recorder(h, dir, mind, maxd, fn);
-}
-
-void wrap_fn_active_decoder(const cffmpeg h, dec_func fn){
- fn_active_decoder(h, fn);
+void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key){
+ return fn_get_avpacket(h, size, key);
}
void* wrap_fn_decode_jpeg(const cffmpeg h, const char* file, int* wid, int* hei){
return fn_dec_jpeg(h, file, wid, hei);
-}
\ No newline at end of file
+}
+
+// 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){
+ return fn_create_encoder(w, h, fps, br, scale_flag, gi);
+}
+
+void wrap_fn_destroy_encoder(const cencoder h){
+ fn_destroy_encoder(h);
+}
+
+void* wrap_fn_encode(cencoder hdl, void *in, const int w, const int h, int *out_size, int *key){
+ uint8_t *out = NULL;
+ const int flag = fn_encode(hdl, (uint8_t*)in, w, h, &out, out_size, key);
+ if (flag > 0 && out != NULL) {
+ return out;
+ }
+ *out_size = 0;
+ *key = 0;
+ return NULL;
+}
--
Gitblit v1.8.0