From e878e92811a2dbfb6b4d3f7b2c357435f56e28db Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期日, 29 九月 2019 10:27:21 +0800
Subject: [PATCH] add trytime
---
csrc/cffmpeg.cpp | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index bb5a79f..7b31f3f 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -10,15 +10,17 @@
}
#endif
-#ifndef LIB_CFFMPEG
-#include "csrc/all.hpp"
-#endif
#include "csrc/wrapper.hpp"
using namespace cffmpeg_wrap;
cffmpeg c_ffmpeg_create(){
- return new Wrapper;
+
+ return new Wrapper();
+}
+
+cffmpeg c_ffmpeg_create2(const char *logfile){
+ return new Wrapper(logfile);
}
void c_ffmpeg_destroy(const cffmpeg h){
@@ -38,19 +40,21 @@
void c_ffmpeg_run_gb28181(const cffmpeg h){
Wrapper *s = (Wrapper*)h;
- s->UseGB28181();
+ s->GB28181();
}
void c_ffmepg_use_cpu(const cffmpeg h){
Wrapper *s = (Wrapper*)h;
- s->UseCPU();
+ s->CPUDec();
}
//////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){
@@ -64,7 +68,7 @@
std::string p(""), id("");
s->GetInfoRecorder(id, i, p);
- // printf("cffmpeg get info : index : %d, file : %s\n", i, p.c_str());
+ // printf("cffmpeg get info : index : %d, file : %s, recid: %s\n", i, p.c_str(), id.c_str());
*index = i;
@@ -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