From 927a49bc04984400cb9b968e41d299cc977e4988 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 九月 2019 12:54:33 +0800
Subject: [PATCH] update so file
---
csrc/cffmpeg.cpp | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 3383b31..bb5a79f 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -58,31 +58,27 @@
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);
+ std::string p(""), 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';
- return path;
-}
+ *pathLen = p.length();
+ char *path = (char*)malloc(*pathLen + 1);
+ memcpy(path, p.c_str(), *pathLen);
+ path[*pathLen] = '\0';
+ *fpath = path;
-char* c_ffmpeg_get_rec_id(const cffmpeg h, const char* p, int *length){
- Wrapper *s = (Wrapper*)h;
- std::string id = s->GetRecorderID(p);
- *length = id.length();
- char *i = (char*)malloc(*length+1);
- memcpy(i, id.c_str(), *length);
- i[*length] = '\0';
- return i;
+ *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){
@@ -105,9 +101,8 @@
}
/////////////////////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