From c60d61c48c7a1e7b693d4c3f6427e3b616d1f471 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 21 十月 2019 12:29:33 +0800
Subject: [PATCH] update ffmpeg
---
csrc/cffmpeg.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 9ade6f9..6e54de4 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -45,11 +45,16 @@
//////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, int mind, int maxd, int audio){
+void c_ffmpeg_set_record_duration(const cffmpeg h, const int min, const int max){
+ Wrapper *s = (Wrapper*)h;
+ s->SetRecMinCacheTime(min);
+}
+
+void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, const int64_t fid, int mind, int maxd, int audio){
Wrapper *s = (Wrapper*)h;
bool a = audio == 0 ? false : true;
- s->BuildRecorder(id, dir, mind, maxd, a);
+ s->BuildRecorder(id, dir, fid, mind, maxd, a);
}
void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
@@ -118,8 +123,8 @@
}
void *c_ffmpeg_create_conv(const int srcW, const int srcH, const int srcFormat,
- const int dstW, const int dstH, const int flag){
- return CreateConvertor(srcW, srcH, srcFormat, dstW, dstH, flag);
+ const int dstW, const int dstH, const int dstFormat, const int flag){
+ return CreateConvertor(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flag);
}
void *c_ffmpeg_conv(void *h, uint8_t *in){
@@ -129,7 +134,3 @@
void c_ffmpeg_destroy_conv(void *h){
DestoryConvertor(h);
}
-
-void* c_gpu_conv(uint8_t *in, const int w, const int h, const int dst_w, const int dst_h, int *length){
- return ConvertYUV2BGR(in, w, h, dst_w, dst_h, length);
-}
\ No newline at end of file
--
Gitblit v1.8.0