From e80ef6acf886a67fa9136fdc8312971cef91b534 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 24 九月 2019 16:41:55 +0800
Subject: [PATCH] 增加addCamera的返回值校验
---
libcffmpeg.c | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index 94e7d5d..dcdf5f9 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -41,12 +41,8 @@
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);
+ 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);
@@ -91,40 +87,33 @@
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_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_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, char **sid, int* index, int* length){
- return fn_info_recorder(h, sid, index, length);
+void wrap_fn_info_recorder(const cffmpeg h, int* index, char** recid, int* recidLen, char** fpath, int* pathLen){
+ return fn_info_recorder(h, index, recid, recidLen, fpath, pathLen);
}
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_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){
- return fn_dec_jpeg(h, file, wid, hei);
+// 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){
+ return fn_decode(file, gb, wid, hei);
}
// for encoder
--
Gitblit v1.8.0