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 --- csrc/cffmpeg.cpp | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp index 3a97159..331aa3b 100644 --- a/csrc/cffmpeg.cpp +++ b/csrc/cffmpeg.cpp @@ -17,8 +17,10 @@ using namespace cffmpeg_wrap; -cffmpeg c_ffmpeg_create(){ - return new Wrapper; +cffmpeg c_ffmpeg_create(const int log, const char *logfile){ + bool logit = false; + if (log) logit = true; + return new Wrapper(logit, logfile); } void c_ffmpeg_destroy(const cffmpeg h){ @@ -48,9 +50,11 @@ //////passive api -void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, int mind, int maxd){ +void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, int mind, int maxd, int audio){ Wrapper *s = (Wrapper*)h; - s->BuildRecorder(id, dir, mind, maxd); + + bool a = audio == 0 ? false : true; + s->BuildRecorder(id, dir, mind, maxd, a); } void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){ @@ -101,12 +105,8 @@ } /////////////////////test -void* c_ffmpeg_decode_jpeg(const char *file, int *wid, int *hei){ - uint8_t *p = DecodeJPEG(file, wid, hei); - if(!p){ - *wid = *hei = 0; - } - return p; +void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei){ + return Decode(file, gb, wid, hei); } // pic encoder -- Gitblit v1.8.0