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
---
csrc/cffmpeg.cpp | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index b78313e..956d33c 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -48,30 +48,35 @@
//////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);
- if(i < 0){
- return NULL;
- }
+ std::string id;
+ s->GetInfoRecorder(id, i, p);
+
+ // printf("cffmpeg get info : index : %d, file : %s\n", i, p.c_str());
+
*index = i;
*length = p.length();
char *path = (char*)malloc(*length + 1);
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;
}
@@ -86,6 +91,13 @@
s->GetPicDecoder(&data, wid, hei);
return data;
}
+
+void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key){
+ Wrapper *s = (Wrapper*)h;
+ unsigned char *data = NULL;
+ 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){
--
Gitblit v1.8.0