From b73029149580370e62dd6c14a270aea902f85cf2 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 18 九月 2019 09:52:30 +0800
Subject: [PATCH] fix rec bug
---
csrc/cffmpeg.cpp | 68 ++++++++++++++--------------------
1 files changed, 28 insertions(+), 40 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index cbb0b1f..3a97159 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -38,41 +38,47 @@
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 *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){
+void 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;
- s->GetInfoRecorder(i, p);
- if(p.empty()){
- return NULL;
- }
- *index = i;
- *length = p.length();
- char *path = (char*)malloc(*length + 1);
- memcpy(path, p.c_str(), *length);
- path[*length] = '\0';
+ std::string p(""), id("");
+ s->GetInfoRecorder(id, i, p);
- return path;
+ // printf("cffmpeg get info : index : %d, file : %s, recid: %s\n", i, p.c_str(), id.c_str());
+
+ *index = i;
+
+ *pathLen = p.length();
+ char *path = (char*)malloc(*pathLen + 1);
+ memcpy(path, p.c_str(), *pathLen);
+ path[*pathLen] = '\0';
+ *fpath = path;
+
+ *recidLen = id.length();
+ char *rid = (char*)malloc(*recidLen + 1);
+ memcpy(rid, id.c_str(), *recidLen);
+ rid[*recidLen] = '\0';
+ *recid = rid;
}
void c_ffmpeg_build_decoder(const cffmpeg h){
@@ -80,10 +86,10 @@
s->BuildDecoder();
}
-void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei){
+void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int64_t *id){
Wrapper *s = (Wrapper*)h;
unsigned char *data = NULL;
- s->GetPicDecoder(&data, wid, hei);
+ s->GetPicDecoder(&data, wid, hei, id);
return data;
}
@@ -93,28 +99,10 @@
s->GetPacket(&data, size, key);
return data;
}
-/////////////////////active api
-void c_ffmpeg_active_recorder(const cffmpeg h, const char *dir, int mind, int maxd,
- rec_func fn){
- Wrapper *s = (Wrapper*)h;
-
- s->ActiveRecorder(dir, mind, maxd,[fn](std::string &p, int &i){
- fn((char*)p.c_str(), i);
- });
-}
-
-void c_ffmpeg_active_decoder(const cffmpeg h, dec_func fn){
- Wrapper *s = (Wrapper*)h;
- s->ActiveDecoder([fn](void* d, int wid, int hei){
- fn(d, wid, hei);
- });
-}
-
/////////////////////test
-void* c_ffmpeg_decode_jpeg(const cffmpeg h, const char *file, int *wid, int *hei){
- Wrapper *s = (Wrapper*)h;
- uint8_t *p = s->decodeJPEG(file, wid, hei);
+void* c_ffmpeg_decode_jpeg(const char *file, int *wid, int *hei){
+ uint8_t *p = DecodeJPEG(file, wid, hei);
if(!p){
*wid = *hei = 0;
}
--
Gitblit v1.8.0