From 1f005df2f3ff78458f332f9bf1cf2e78b6a8e8e4 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 26 九月 2019 14:43:52 +0800
Subject: [PATCH] bug fix audio codec
---
libcffmpeg.c | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index 3b3541f..44838d4 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -25,6 +25,10 @@
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");
@@ -35,12 +39,10 @@
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_dec_jpeg = (lib_cffmpeg_decode_jpeg)dlsym(lib, "c_ffmpeg_decode_jpeg");
- release_if_err(fn_dec_jpeg, 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);
@@ -61,8 +63,8 @@
}
}
-cffmpeg wrap_fn_create(){
- return fn_create();
+cffmpeg wrap_fn_create(const int log, const char *logfile){
+ return fn_create(log, logfile);
}
void wrap_fn_destroy(const cffmpeg h){
@@ -77,36 +79,41 @@
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);
}
-char* wrap_fn_info_recorder(const cffmpeg h, int* index, int* length){
- return fn_info_recorder(h, index, length);
+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);
+}
+
+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_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_get_avpacket(const cffmpeg h, int* size, int* key){
+ return fn_get_avpacket(h, size, key);
}
-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