From 9b12b43b25fd5a476205bc693be0cf836c281bc1 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 21 十一月 2019 13:36:58 +0800
Subject: [PATCH] remove code not used
---
csrc/cffmpeg.cpp | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 7b31f3f..f77b232 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -33,9 +33,9 @@
s->RunStream(input);
}
-void c_ffmpeg_scale(const cffmpeg h, const int wid, const int hei, const int flags){
+int c_ffmpeg_get_fps(const cffmpeg h){
Wrapper *s = (Wrapper*)h;
- s->ScalePicture(wid, hei, flags);
+ return s->GetFPS();
}
void c_ffmpeg_run_gb28181(const cffmpeg h){
@@ -50,11 +50,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){
@@ -90,10 +95,10 @@
s->BuildDecoder();
}
-void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int64_t *id){
+void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id){
Wrapper *s = (Wrapper*)h;
unsigned char *data = NULL;
- s->GetPicDecoder(&data, wid, hei, id);
+ s->GetPicDecoder(&data, wid, hei, format, length, id);
return data;
}
@@ -102,11 +107,6 @@
unsigned char *data = NULL;
s->GetPacket(&data, size, key);
return data;
-}
-
-/////////////////////test
-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