From 1518fb1f0e59beedfa32663adb3d0bee302f1ad5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 26 七月 2019 10:42:26 +0800
Subject: [PATCH] bug fix
---
csrc/cffmpeg.cpp | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index e083e8b..cbb0b1f 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -36,6 +36,17 @@
s->ScalePicture(wid, hei, flags);
}
+void c_ffmpeg_run_gb28181(const cffmpeg h){
+ Wrapper *s = (Wrapper*)h;
+ s->UseGB28181();
+}
+
+void c_ffmepg_use_cpu(const cffmpeg h){
+ Wrapper *s = (Wrapper*)h;
+ s->UseCPU();
+}
+
+
//////passive api
void c_ffmpeg_build_recorder(const cffmpeg h, const char *dir, int mind, int maxd){
Wrapper *s = (Wrapper*)h;
@@ -52,7 +63,7 @@
int i;
std::string p;
s->GetInfoRecorder(i, p);
- if(i < 0){
+ if(p.empty()){
return NULL;
}
*index = i;
@@ -73,6 +84,13 @@
Wrapper *s = (Wrapper*)h;
unsigned char *data = NULL;
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
@@ -101,4 +119,17 @@
*wid = *hei = 0;
}
return p;
-}
\ No newline at end of file
+}
+
+// pic encoder
+void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi){
+ return CreateEncoder(w, h, fps, br, scale_flag, gi);
+}
+
+void c_ffmpeg_destroy_encoder(void *h){
+ DestroyEncoder(h);
+}
+
+int c_ffmpeg_encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key){
+ return Encode(hdl, in, w, h, out, size, key);
+}
--
Gitblit v1.8.0