From 177293afbc1635e87d82070abeb687974326f41a Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 15:46:50 +0800
Subject: [PATCH] add retval
---
csrc/cffmpeg.cpp | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index e2afc1a..864e607 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -43,16 +43,17 @@
s->GB28181();
}
-char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen){
+int c_ffmpeg_get_gb28181_pic(const char *rtspUrl, char** ret, int *retDataLen, const int tt){
char * retData = (char *)malloc(sizeof(char) * 3000000);
- int flag = GetGb28181Pic(rtspUrl, retData, retDataLen);
- if(flag == -1){
+ int flag = GetGb28181Pic(rtspUrl, retData, retDataLen, tt);
+ if(flag <= 0){
free(retData);
*retDataLen = 0;
- return NULL;
+ *ret = NULL;
}
+ *ret = retData;
- return retData;
+ return flag;
}
void c_ffmepg_use_cpu(const cffmpeg h){
@@ -134,6 +135,11 @@
return s->GetPacket(data, size, key);
}
+int c_ffmpeg_set_devid(const cffmpeg h, const int devid){
+ Wrapper *s = (Wrapper*)h;
+ return s->SetDevID(devid);
+}
+
void c_ffmpeg_release_buf(void* buf){
if (buf){
free(buf);
--
Gitblit v1.8.0