From 278634c0d2eeba9e3fcc3b4cd56ddfb3323277d7 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 10 三月 2020 10:08:20 +0800
Subject: [PATCH] compatible to local files
---
csrc/cffmpeg.cpp | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index fc92229..8d872c4 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -68,7 +68,7 @@
}
void c_ffmpeg_set_record_duration(const cffmpeg h, const int min, const int max){
Wrapper *s = (Wrapper*)h;
- s->SetRecMinCacheTime(min);
+ s->SetRecMinCacheTime(min, max);
}
void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, const int64_t fid, int mind, int maxd, int audio){
@@ -78,16 +78,16 @@
s->BuildRecorder(id, dir, fid, mind, maxd, a);
}
-void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
+int c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
Wrapper *s = (Wrapper*)h;
- s->FireRecorder(sid, id);
+ return s->FireRecorder(sid, id);
}
-void c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen){
+int c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen){
Wrapper *s = (Wrapper*)h;
int i;
std::string p(""), id("");
- s->GetInfoRecorder(id, i, p);
+ int ret = s->GetInfoRecorder(id, i, p);
// printf("cffmpeg get info : index : %d, file : %s, recid: %s\n", i, p.c_str(), id.c_str());
@@ -104,6 +104,7 @@
memcpy(rid, id.c_str(), *recidLen);
rid[*recidLen] = '\0';
*recid = rid;
+ return ret;
}
void c_ffmpeg_build_decoder(const cffmpeg h){
@@ -111,11 +112,9 @@
s->OpenDecoder();
}
-void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id){
+int c_ffmpeg_get_pic_decoder(const cffmpeg h, unsigned char **data, int *wid, int *hei, int *format, int *length, int64_t *id){
Wrapper *s = (Wrapper*)h;
- unsigned char *data = NULL;
- s->GetPicDecoder(&data, wid, hei, format, length, id);
- return data;
+ return s->GetPicDecoder(data, wid, hei, format, length, id);
}
void c_ffmpeg_close_stream(const cffmpeg h){
@@ -130,6 +129,11 @@
return data;
}
+int c_ffmpeg_get_avpacket2(const cffmpeg h, unsigned char **data, int *size, int *key){
+ Wrapper *s = (Wrapper*)h;
+ return s->GetPacket(data, size, key);
+}
+
// pic encoder
void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int pix_fmt, const int scale_flag, const int gi){
return CreateEncoder(w, h, fps, br, pix_fmt, scale_flag, gi);
--
Gitblit v1.8.0