From d2bec7c45f71a12734b359f10bda6302ecd8a657 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 29 七月 2019 11:49:22 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg
---
libcffmpeg.c | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index e33a376..a380de4 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -35,16 +35,14 @@
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_get_avpacket = (lib_cffmpeg_avpacket)dlsym(lib, "c_ffmpeg_get_avpacket");
release_if_err(fn_get_avpacket, 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_dec_jpeg = (lib_cffmpeg_decode_jpeg)dlsym(lib, "c_ffmpeg_decode_jpeg");
release_if_err(fn_dec_jpeg, lib);
@@ -91,16 +89,20 @@
fn_cpu(h);
}
-void wrap_fn_recorder(const cffmpeg h, const char* dir, int mind, int maxd){
- fn_recorder(h, dir, mind, maxd);
+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 int64_t id){
- fn_fire_recorder(h, id);
+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){
@@ -113,14 +115,6 @@
void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key){
return fn_get_avpacket(h, size, key);
-}
-
-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_decode_jpeg(const cffmpeg h, const char* file, int* wid, int* hei){
--
Gitblit v1.8.0