From 470d4180e2b86eee41c9c14910e4131d16edb8b7 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 17:02:54 +0800
Subject: [PATCH] bug fixed gb28181 capture
---
csrc/cffmpeg.cpp | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 8d872c4..b343ef4 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -43,9 +43,9 @@
s->GB28181();
}
-char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen){
+char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen, const int tt){
char * retData = (char *)malloc(sizeof(char) * 3000000);
- int flag = GetGb28181Pic(rtspUrl, retData, retDataLen);
+ int flag = GetGb28181Pic(rtspUrl, retData, retDataLen, tt);
if(flag == -1){
free(retData);
*retDataLen = 0;
@@ -134,6 +134,17 @@
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);
+ }
+}
+
// pic encoder
void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int pix_fmt, const int scale_flag, const int gi){
return CreateEncoder(w, h, fps, br, pix_fmt, scale_flag, gi);
--
Gitblit v1.8.0