From f6aa35eedbc76e7467a68dbe3aba63ec8cb352a5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 26 七月 2019 10:51:03 +0800
Subject: [PATCH] add log
---
csrc/cffmpeg.cpp | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 2bf0a0f..05be1a3 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -31,6 +31,22 @@
s->RunStream(input);
}
+void c_ffmpeg_scale(const cffmpeg h, const int wid, const int hei, const int flags){
+ Wrapper *s = (Wrapper*)h;
+ 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;
@@ -47,9 +63,9 @@
int i;
std::string p;
s->GetInfoRecorder(i, p);
- if(i < 0){
- return NULL;
- }
+
+ printf("cffmpeg get info : index : %d, file : %s\n", i, p.c_str());
+
*index = i;
*length = p.length();
char *path = (char*)malloc(*length + 1);
@@ -68,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
@@ -96,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