From 88c21b872799a1ae9dd7dd7d20f3811d749d9418 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 26 七月 2019 14:04:22 +0800
Subject: [PATCH] add rec
---
apipassive.go | 22 ++-
csrc/wrapper.cpp | 242 ++++++++++++---------------------
csrc/wrapper.hpp | 38 ++---
cffmpeg.h | 6
csrc/common/callback.hpp | 2
libcffmpeg.c | 12
csrc/buz/recorder.hpp | 7
csrc/cffmpeg.cpp | 17 +
libcffmpeg.h | 12
csrc/buz/recorder.cpp | 6
10 files changed, 156 insertions(+), 208 deletions(-)
diff --git a/apipassive.go b/apipassive.go
index e9f7456..5f866f5 100644
--- a/apipassive.go
+++ b/apipassive.go
@@ -10,33 +10,39 @@
)
// FireRecorder fire recorder
-func (h *GoFFMPEG) FireRecorder(id int64) {
- C.wrap_fn_fire_recorder(h.ffmpeg, C.long(id))
+func (h *GoFFMPEG) FireRecorder(sid string, id int64) {
+ csid := C.CString(sid)
+ defer C.free(unsafe.Pointer(csid))
+ C.wrap_fn_fire_recorder(h.ffmpeg, csid, C.long(id))
}
// BuildRecorder build recorder
-func (h *GoFFMPEG) BuildRecorder(output string, mind, maxd int) {
+func (h *GoFFMPEG) BuildRecorder(sid, output string, mind, maxd int) {
out := C.CString(output)
defer C.free(unsafe.Pointer(out))
+ csid := C.CString(sid)
+ defer C.free(unsafe.Pointer(csid))
- C.wrap_fn_recorder(h.ffmpeg, out, C.int(mind), C.int(maxd))
+ C.wrap_fn_recorder(h.ffmpeg, csid, out, C.int(mind), C.int(maxd))
}
// GetInfoRecorder info
-func (h *GoFFMPEG) GetInfoRecorder() (int, string) {
+func (h *GoFFMPEG) GetInfoRecorder() (string, int, string) {
var i C.int = -1
var l C.int
-
- p := C.wrap_fn_info_recorder(h.ffmpeg, &i, &l)
+ var sid *C.char
+ p := C.wrap_fn_info_recorder(h.ffmpeg, &sid, &i, &l)
// if p == nil {
// return -1, ""
// }
path := C.GoString(p)
C.free(unsafe.Pointer(p))
+ goid := C.GoString(sid)
+ C.free(unsafe.Pointer(sid))
// fmt.Println("Go get info : ", path, " len: ", l)
- return int(i), path
+ return goid, int(i), path
}
// BuildDecoder build decoder
diff --git a/cffmpeg.h b/cffmpeg.h
index f992654..6974816 100644
--- a/cffmpeg.h
+++ b/cffmpeg.h
@@ -20,9 +20,9 @@
void c_ffmpeg_run_gb28181(const cffmpeg h);
void c_ffmepg_use_cpu(const cffmpeg h);
/////////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, const char *dir, int mind, int maxd);
-void c_ffmpeg_fire_recorder(const cffmpeg h, const int64_t id);
-char* c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, int *length);
+void c_ffmpeg_build_recorder(const cffmpeg h, const char*id, const char *dir, int mind, int maxd);
+void c_ffmpeg_fire_recorder(const cffmpeg h, const char*sid, const int64_t id);
+char* c_ffmpeg_get_info_recorder(const cffmpeg h, char **sid, int *index, int *length);
void c_ffmpeg_build_decoder(const cffmpeg h);
void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei);
diff --git a/csrc/buz/recorder.cpp b/csrc/buz/recorder.cpp
index 4bfd370..2267bf3 100644
--- a/csrc/buz/recorder.cpp
+++ b/csrc/buz/recorder.cpp
@@ -17,7 +17,7 @@
namespace cffmpeg_wrap{
namespace buz{
- Recorder::Recorder(FormatIn *in)
+ Recorder::Recorder(FormatIn *in, const std::string &id)
:in_(in)
,out_(NULL)
,maxduration(30 * 25)
@@ -26,6 +26,7 @@
,cur_frame(-1)
,thread_(nullptr)
,stop_recorder_(false)
+ ,id_(id)
,id_frame_(0)
,file_frame_index_(-1)
,file_path_("")
@@ -59,6 +60,7 @@
void Recorder::start_writer(){
if (cur_frame == 0) {
+ srandom(time(NULL));
file_path_ = dir_ + "/" + std::to_string(random()) + ".mp4";
out_->JustWriter(in_->getStream(), file_path_.c_str());
logIt("start record %s", file_path_.c_str());
@@ -95,7 +97,7 @@
}
//callback to frame index and path
if(func_rec_info_){
- func_rec_info_(file_frame_index_, file_path_);
+ func_rec_info_(id_,file_frame_index_, file_path_);
// logIt("recoder index %d, file name %s\n", file_frame_index_, file_path_.c_str());
}else{
// logIt("recorder has no func_rec_info");
diff --git a/csrc/buz/recorder.hpp b/csrc/buz/recorder.hpp
index 3e12d81..70c32fe 100644
--- a/csrc/buz/recorder.hpp
+++ b/csrc/buz/recorder.hpp
@@ -29,7 +29,7 @@
class Recorder{
public:
- explicit Recorder(ffwrapper::FormatIn *in);
+ Recorder(ffwrapper::FormatIn *in, const std::string &id);
~Recorder();
public:
@@ -63,11 +63,12 @@
std::unique_ptr<std::thread> thread_;
std::atomic_bool stop_recorder_;
std::mutex mutex_pkt_;
- std::condition_variable cv_;
+ std::condition_variable cv_;
std::string dir_;
+ std::string id_;
- int64_t id_frame_;
+ int64_t id_frame_;
int file_frame_index_;
std::string file_path_;
FUNC_REC_INFO func_rec_info_;
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 433a8ae..956d33c 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -48,21 +48,22 @@
//////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, 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){
Wrapper *s = (Wrapper*)h;
- s->BuildRecorder(dir, mind, maxd);
+ s->BuildRecorder(id, dir, mind, maxd);
}
-void c_ffmpeg_fire_recorder(const cffmpeg h, const int64_t id){
+void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
Wrapper *s = (Wrapper*)h;
- s->FireRecorder(id);
+ s->FireRecorder(sid, id);
}
-char* c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, int *length){
+char* c_ffmpeg_get_info_recorder(const cffmpeg h, char **sid, int *index, int *length){
Wrapper *s = (Wrapper*)h;
int i;
std::string p;
- s->GetInfoRecorder(i, p);
+ std::string id;
+ s->GetInfoRecorder(id, i, p);
// printf("cffmpeg get info : index : %d, file : %s\n", i, p.c_str());
@@ -72,6 +73,10 @@
memcpy(path, p.c_str(), *length);
path[*length] = '\0';
+ *sid = (char*)malloc(id.length()+1);
+ memcpy(*sid, id.c_str(), id.length());
+ *sid[id.length()] = '\0';
+
return path;
}
diff --git a/csrc/common/callback.hpp b/csrc/common/callback.hpp
index c9c264b..c65b4d4 100644
--- a/csrc/common/callback.hpp
+++ b/csrc/common/callback.hpp
@@ -7,6 +7,6 @@
typedef std::function<void(std::string&, int&)> FUNC_REC;
typedef std::function<void(void*,int,int)> FUNC_DEC;
-typedef std::function<void(int &id_frame, std::string &file_path)> FUNC_REC_INFO;
+typedef std::function<void(std::string &id, int &id_frame, std::string &file_path)> FUNC_REC_INFO;
#endif /* callback_h */
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 892b693..47ddc82 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -30,7 +30,6 @@
Wrapper::Wrapper()
:input_url_("")
- ,recorder_(NULL)
,thread_(nullptr)
,stop_stream_(false)
,bridge_(NULL)
@@ -39,7 +38,7 @@
,scale_f_(SWS_POINT)
,gb_(0)
,cpu_(0)
- ,encoder_(nullptr)
+ ,use_decoder_(false)
{
makeTheWorld();
}
@@ -54,12 +53,7 @@
if(bridge_){
delete bridge_; bridge_ = NULL;
}
- if(recorder_){
- delete recorder_; recorder_ = NULL;
- }
- if (encoder_){
- delete encoder_; encoder_ = NULL;
- }
+
}
void Wrapper::ScalePicture(const int w, const int h, const int flags){
@@ -99,101 +93,13 @@
logIt("yolo can't find video stream\n");
return nullptr;
}
- bool flag = true;
- if(map_workers_.find(WORKER_DECODER) != map_workers_.end()){
- flag = in->openCodec(AVMEDIA_TYPE_VIDEO, NULL);
- auto dec_ctx = in->getCodecContext();
- if(bridge_)delete bridge_;
-
- scale_w_ = scale_w_ == 0 || scale_w_ > dec_ctx->width ? dec_ctx->width : scale_w_;
- scale_h_ = scale_h_ == 0 || scale_h_ > dec_ctx->height ? dec_ctx->height : scale_h_;
-
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
- bridge_ = new cvbridge(
- dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
- scale_w_, scale_h_, pix_fmt, scale_f_);
-
- }
- if (!flag){
- logIt("FormatIn openCodec Failed!");
- return nullptr;
- }
+
return in;
}
return nullptr;
}
- // ffwrapper::FormatIn* Wrapper::init_reader_gb28181(const char* input){
-
- // VideoProp prop;
- // prop.url_ = input;
- // prop.rtsp_tcp_ = true;
- // prop.gpu_acc_ = !cpu_;
- // ffwrapper::FormatIn* in(new FormatIn(prop.gpuAccl()));
- // AVDictionary *avdic = prop.optsFormat();
- // int flag = in->openGb28181(input, &avdic);
- // if(avdic){
- // logIt("ERROR:in->openGb28181(input, &avdic):flag:%d\n",flag);
- // av_dict_free(&avdic);
- // }
- // if(flag == 0){
- // if(!in->findStreamInfo(NULL)){
- // logIt("yolo can't find video stream\n");
- // return nullptr;
- // }
- // bool flag = true;
- // if(map_workers_.find(WORKER_DECODER) != map_workers_.end()){
- // flag = in->openCodec(AVMEDIA_TYPE_VIDEO, NULL);
- // auto dec_ctx = in->getCodecContext();
- // if(bridge_)delete bridge_;
- // scale_w_ = scale_w_ == 0 || scale_w_ > dec_ctx->width ? dec_ctx->width : scale_w_;
- // scale_h_ = scale_h_ == 0 || scale_h_ > dec_ctx->height ? dec_ctx->height : scale_h_;
- // AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
- // bridge_ = new cvbridge(
- // dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
- // scale_w_, scale_h_, pix_fmt, scale_f_);
- // }
- // if (!flag){
- // logIt("FormatIn openCodec Failed!");
- // return nullptr;
- // }
- // return in;
- // }
- // return nullptr;
- // }
-
- int Wrapper::init_recorder(FormatIn *in, std::string dir, const int mind, const int maxd){
- if(!in){
- logIt("Init wrapper first");
- return -1;
- }
- if(recorder_){
- logIt("recorder exist");
- delete recorder_;
- }
-
- recorder_ = new Recorder(in);
- recorder_->SetCallback([&](int &index, std::string &path){
- cache_rec_info(index, path);
- });
-
- int trycnt = 0;
- while(trycnt < 100){
- const int ret = recorder_->Run(dir.c_str(), mind, maxd);
- if(ret == 0) break;
- usleep(200000);
- }
- return trycnt == 100;
- }
-
- void Wrapper::init_worker(ffwrapper::FormatIn *in){
- for(auto &i : map_workers_){
- if(i.second(in) != 0){
- logIt("worker %d init error", i.first);
- }
- }
- }
void Wrapper::run_stream_thread(){
@@ -205,7 +111,6 @@
usleep(200000);
continue;
}
- init_worker(in.get());
int64_t id = 0;
avpacket pkt;
@@ -250,20 +155,93 @@
}
//////////////recorder
- void Wrapper::BuildRecorder(const char *output, const int mindur, const int maxdur){
+ std::shared_ptr<Recorder> Wrapper::init_recorder(FormatIn *in, std::string id,std::string dir, const int mind, const int maxd){
+ if(!in){
+ logIt("Init wrapper first");
+ return nullptr;
+ }
+
+ auto rec = std::make_shared<Recorder>(in, id);
+
+ rec->SetCallback([&](std::string &id, int &index, std::string &path){
+ cache_rec_info(id, index, path);
+ });
+
+ int trycnt = 0;
+ while(trycnt < 100){
+ const int ret = rec->Run(dir.c_str(), mind, maxd);
+ if(ret == 0) break;
+ usleep(200000);
+ }
+ if (trycnt < 100){
+ return rec;
+ }
+ return nullptr;
+ }
+
+ void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur){
+ std::string rid(id);
std::string dir(output);
- map_workers_[WORKER_RECORDER] = [=](FormatIn *in){
- return init_recorder(in, dir, mindur, maxdur);
+ auto fn = [=](FormatIn *in){
+ return init_recorder(in, rid, dir, mindur, maxdur);
};
+ std::shared_ptr<Recorder> rec(nullptr);
+
+ FnRec r = FnRec{fn, rec};
+ map_rec_[rid] = r;
}
- int Wrapper::FireRecorder(const int64_t &id){
- if(recorder_){
- recorder_->FireRecorder(id);
+ int Wrapper::FireRecorder(const char* sid,const int64_t &id){
+ auto iter = map_rec_.find(sid);
+ if (iter != map_rec_.end()){
+ if(iter->second.rec){
+ iter->second.rec->FireRecorder(id);
+ }
}
}
- void Wrapper::cache_rec_info(int &index, std::string &path){
+ void Wrapper::run_worker(ffwrapper::FormatIn *in, avpacket &pkt){
+ if(!pkt.data) return;
+ if (use_decoder_) {
+ if(in->getCodecContext() == NULL){
+
+ bool flag = true;
+ flag = in->openCodec(AVMEDIA_TYPE_VIDEO, NULL);
+ auto dec_ctx = in->getCodecContext();
+ if(bridge_)delete bridge_;
+
+ scale_w_ = scale_w_ == 0 || scale_w_ > dec_ctx->width ? dec_ctx->width : scale_w_;
+ scale_h_ = scale_h_ == 0 || scale_h_ > dec_ctx->height ? dec_ctx->height : scale_h_;
+
+ AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
+ bridge_ = new cvbridge(
+ dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
+ scale_w_, scale_h_, pix_fmt, scale_f_);
+
+ if (!flag){
+ logIt("FormatIn openCodec Failed!");
+ }
+ }
+
+ auto frame(std::make_shared<FrameData>());
+ auto ret = in->decode(frame, pkt.data);
+ if(ret == 1){
+ //鍚愬嚭鏁版嵁
+ cache_pic(frame);
+ }
+ }
+
+ for(auto &i : map_rec_){
+ if (!i.second.rec){
+ i.second.rec = i.second.fn_init(in);
+ }
+ if (i.second.rec){
+ i.second.rec->CachePacket(pkt);
+ }
+ }
+ }
+
+ void Wrapper::cache_rec_info(std::string &id, int &index, std::string &path){
if(func_rec_){ //active api
func_rec_(path, index);
}else{ // passive api
@@ -274,30 +252,34 @@
}
}
struct record_file_info info;
+ info.id = id;
info.file_frame_index = index;
info.file_path = path;
list_rec_.emplace_back(info);
logIt("list rec files count : %d", list_rec_.size());
+ map_rec_.erase(id);
}
}
- void Wrapper::GetInfoRecorder(int &index, std::string &path){
+ void Wrapper::GetInfoRecorder(std::string &sid, int &index, std::string &path){
std::lock_guard<std::mutex> l(mutex_rec_);
if(list_rec_.empty()){
index = -1;
path = "";
+ sid = "";
return;
}
auto info = list_rec_.front();
index = info.file_frame_index;
path = info.file_path;
+ sid = info.id;
list_rec_.pop_front();
// logIt("go get info index: %d, file: %s\n", index, path.c_str());
}
////////decoder
void Wrapper::BuildDecoder(){
- map_workers_[WORKER_DECODER] = [&](FormatIn*){return 0;};
+ use_decoder_ = true;
}
void Wrapper::cache_pic(std::shared_ptr<ffwrapper::FrameData> &frame){
@@ -365,26 +347,12 @@
list_avpkt_.emplace_back(pkt);
}
- void Wrapper::run_worker(ffwrapper::FormatIn *in, avpacket &pkt){
- if(!pkt.data) return;
- if (map_workers_.find(WORKER_DECODER) != map_workers_.end()) {
- auto frame(std::make_shared<FrameData>());
- auto ret = in->decode(frame, pkt.data);
- if(ret == 1){
- //鍚愬嚭鏁版嵁
- cache_pic(frame);
- }
- }
- if(recorder_){
- recorder_->CachePacket(pkt);
- }
- }
///// active api
void Wrapper::ActiveRecorder(const char *dir, const int mind, const int maxd,
FUNC_REC func){
- BuildRecorder(dir, mind, maxd);
+ BuildRecorder("", dir, mind, maxd);
func_rec_ = func;
}
@@ -445,36 +413,6 @@
return NULL;
}
-
- void Wrapper::BuildEncoder(const char *file, const int w, const int h, const int fps, const int br, const int gi){
- std::string dir(file);
-
- map_workers_[WORKER_ENCODER] = [=](FormatIn *in){
- return init_encoder(in, dir.c_str(), w, h, fps, br, gi);
- };
- }
-
- int Wrapper::init_encoder(FormatIn *in, const char *file, const int w, const int h, const int fps, const int br, const int gi){
- if(!in){
- logIt("Init wrapper first");
- return -1;
- }
- if(encoder_){
- logIt("recorder exist");
- delete encoder_;
- }
-
- VideoProp prop_;
- AVCodecContext *ctx = in->getCodecContext();
- if(w == 0 && h == 0){
- prop_.width_ = ctx->width;
- prop_.height_ = ctx->height;
- }
- prop_.sample_aspect_ratio_ = ctx->sample_aspect_ratio;
- encoder_ = new FormatOut(prop_, file);
-
- return 0;
- }
/////// for encoder
typedef struct _PicEncoder{
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index db45ea7..8c866fd 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -28,15 +28,8 @@
class cvbridge;
}
-enum WORKER{
- WORKER_RECORDER = 0,
- WORKER_DECODER,
- WORKER_ENCODER,
-};
-
namespace cffmpeg_wrap{
- typedef std::function<int(ffwrapper::FormatIn*)> FUNC_WORKER;
typedef struct _pic_bgr24{
unsigned char *data;
@@ -48,6 +41,14 @@
class Recorder;
struct avpacket;
}
+
+ typedef std::function<std::shared_ptr<buz::Recorder>(ffwrapper::FormatIn*)> FN_REC;
+
+ typedef struct _fn_rec{
+ FN_REC fn_init;
+ std::shared_ptr<buz::Recorder> rec;
+ }FnRec;
+
class Wrapper{
public:
Wrapper();
@@ -56,11 +57,10 @@
private:
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
// ffwrapper::FormatIn* init_reader_gb28181(const char* input);
- void init_worker(ffwrapper::FormatIn *in);
- int init_recorder(ffwrapper::FormatIn *in, std::string dir, const int mind, const int maxd);
void run_worker(ffwrapper::FormatIn *in, buz::avpacket &pkt);
+ std::shared_ptr<buz::Recorder> init_recorder(ffwrapper::FormatIn *in, std::string id,std::string dir, const int mind, const int maxd);
- void cache_rec_info(int &index, std::string &path);
+ void cache_rec_info(std::string &id, int &index, std::string &path);
void cache_pic(std::shared_ptr<ffwrapper::FrameData> &frame);
void cacheAVPacket(const AVPacket &pkt);
@@ -70,9 +70,9 @@
void run_stream_thread();
public: //recorder
- void BuildRecorder(const char *dir, const int mind, const int maxd);
- int FireRecorder(const int64_t &id);
- void GetInfoRecorder(int &index, std::string &path);
+ void BuildRecorder(const char* id,const char *dir, const int mind, const int maxd);
+ int FireRecorder(const char* sid,const int64_t &id);
+ void GetInfoRecorder(std::string &sid, int &index, std::string &path);
// active api
void ActiveRecorder(const char *dir, const int mind, const int maxd,
@@ -88,23 +88,21 @@
//active api
void ActiveDecoder(FUNC_DEC fn);
- public:
- void BuildEncoder(const char *file, const int w, const int h, const int fps, const int br, const int gi);
- int init_encoder(ffwrapper::FormatIn *in, const char *file, const int w, const int h, const int fps, const int br, const int gi);
-
private:
std::string input_url_;
- buz::Recorder *recorder_;
std::unique_ptr<std::thread> thread_;
std::atomic_bool stop_stream_;
ffwrapper::cvbridge *bridge_;
- std::unordered_map<int, FUNC_WORKER> map_workers_;
+
+ bool use_decoder_;
+ std::unordered_map<std::string, FnRec> map_rec_;
//passive api
struct record_file_info{
+ std::string id;
int file_frame_index;
std::string file_path;
};
@@ -127,8 +125,6 @@
public:
uint8_t *decodeJPEG(const char *file, int *w, int *h);
- private:
- ffwrapper::FormatOut *encoder_;
};
void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
diff --git a/libcffmpeg.c b/libcffmpeg.c
index e33a376..94e7d5d 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -91,16 +91,16 @@
fn_cpu(h);
}
-void wrap_fn_recorder(const cffmpeg h, const char* dir, int mind, int maxd){
- fn_recorder(h, dir, mind, maxd);
+void wrap_fn_recorder(const cffmpeg h, const char* id, const char* dir, int mind, int maxd){
+ fn_recorder(h, id, dir, mind, maxd);
}
-void wrap_fn_fire_recorder(const cffmpeg h, const int64_t id){
- fn_fire_recorder(h, id);
+void wrap_fn_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
+ fn_fire_recorder(h, sid, id);
}
-char* wrap_fn_info_recorder(const cffmpeg h, int* index, int* length){
- return fn_info_recorder(h, index, length);
+char* wrap_fn_info_recorder(const cffmpeg h, char **sid, int* index, int* length){
+ return fn_info_recorder(h, sid, index, length);
}
void wrap_fn_decoder(const cffmpeg h){
diff --git a/libcffmpeg.h b/libcffmpeg.h
index 1cfbaa5..eb92d66 100644
--- a/libcffmpeg.h
+++ b/libcffmpeg.h
@@ -19,9 +19,9 @@
typedef void (*lib_cffmpeg_scale)(const cffmpeg, const int, const int, const int);
typedef void (*lib_cffmpeg_gb28181)(const cffmpeg);
typedef void (*lib_cffmpeg_cpu)(const cffmpeg);
-typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, int, int);
-typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const int64_t);
-typedef char*(*lib_cffmpeg_info_recorder)(const cffmpeg, int*, int*);
+typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, const char*, int, int);
+typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const char*, const int64_t);
+typedef char*(*lib_cffmpeg_info_recorder)(const cffmpeg, char**, int*, int*);
typedef void (*lib_cffmpeg_decoder)(const cffmpeg);
typedef void*(*lib_cffmpeg_pic)(const cffmpeg, int*, int*);
typedef void*(*lib_cffmpeg_avpacket)(const cffmpeg, int*, int*);
@@ -55,9 +55,9 @@
void wrap_fn_scale(const cffmpeg h, const int wid, const int hei, const int flags);
void wrap_fn_run_gb28181(const cffmpeg h);
void wrap_fn_use_cpu(const cffmpeg h);
-void wrap_fn_recorder(const cffmpeg h, const char* dir, int mind, int maxd);
-void wrap_fn_fire_recorder(const cffmpeg h, const int64_t id);
-char* wrap_fn_info_recorder(const cffmpeg, int*, int*);
+void wrap_fn_recorder(const cffmpeg h, const char* id, const char* dir, int mind, int maxd);
+void wrap_fn_fire_recorder(const cffmpeg h, const char *sid, const int64_t id);
+char* wrap_fn_info_recorder(const cffmpeg, char** sid, int* index, int* length);
void wrap_fn_decoder(const cffmpeg h);
void* wrap_fn_decoder_pic(const cffmpeg h, int* wid, int* hei);
void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key);
--
Gitblit v1.8.0