From 68a19a73681301c6712e10d55bc64324716dbd24 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 09 十月 2019 15:38:47 +0800
Subject: [PATCH] split scale
---
csrc/cffmpeg.cpp | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index cbb0b1f..9ade6f9 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -10,15 +10,17 @@
}
#endif
-#ifndef LIB_CFFMPEG
-#include "csrc/all.hpp"
-#endif
#include "csrc/wrapper.hpp"
using namespace cffmpeg_wrap;
cffmpeg c_ffmpeg_create(){
- return new Wrapper;
+
+ return new Wrapper();
+}
+
+cffmpeg c_ffmpeg_create2(const char *logfile){
+ return new Wrapper(logfile);
}
void c_ffmpeg_destroy(const cffmpeg h){
@@ -31,48 +33,51 @@
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();
+ s->GB28181();
}
void c_ffmepg_use_cpu(const cffmpeg h){
Wrapper *s = (Wrapper*)h;
- s->UseCPU();
+ s->CPUDec();
}
//////passive api
-void c_ffmpeg_build_recorder(const cffmpeg h, const char *dir, int mind, int maxd){
+void c_ffmpeg_build_recorder(const cffmpeg h, const char* id, const char *dir, int mind, int maxd, int audio){
Wrapper *s = (Wrapper*)h;
- s->BuildRecorder(dir, mind, maxd);
+
+ bool a = audio == 0 ? false : true;
+ s->BuildRecorder(id, dir, mind, maxd, a);
}
-void c_ffmpeg_fire_recorder(const cffmpeg h, const int64_t id){
+void c_ffmpeg_fire_recorder(const cffmpeg h, const char* sid, const int64_t id){
Wrapper *s = (Wrapper*)h;
- s->FireRecorder(id);
+ 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);
- if(p.empty()){
- return NULL;
- }
- *index = i;
- *length = p.length();
- char *path = (char*)malloc(*length + 1);
- memcpy(path, p.c_str(), *length);
- path[*length] = '\0';
+ std::string p(""), id("");
+ s->GetInfoRecorder(id, i, p);
- return path;
+ // printf("cffmpeg get info : index : %d, file : %s, recid: %s\n", i, p.c_str(), id.c_str());
+
+ *index = i;
+
+ *pathLen = p.length();
+ char *path = (char*)malloc(*pathLen + 1);
+ memcpy(path, p.c_str(), *pathLen);
+ path[*pathLen] = '\0';
+ *fpath = path;
+
+ *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){
@@ -80,10 +85,10 @@
s->BuildDecoder();
}
-void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei){
+void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id){
Wrapper *s = (Wrapper*)h;
unsigned char *data = NULL;
- s->GetPicDecoder(&data, wid, hei);
+ s->GetPicDecoder(&data, wid, hei, format, length, id);
return data;
}
@@ -93,32 +98,10 @@
s->GetPacket(&data, size, key);
return data;
}
-/////////////////////active api
-void c_ffmpeg_active_recorder(const cffmpeg h, const char *dir, int mind, int maxd,
- rec_func fn){
- Wrapper *s = (Wrapper*)h;
-
- s->ActiveRecorder(dir, mind, maxd,[fn](std::string &p, int &i){
- fn((char*)p.c_str(), i);
- });
-}
-
-void c_ffmpeg_active_decoder(const cffmpeg h, dec_func fn){
- Wrapper *s = (Wrapper*)h;
- s->ActiveDecoder([fn](void* d, int wid, int hei){
- fn(d, wid, hei);
- });
-}
-
/////////////////////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);
- if(!p){
- *wid = *hei = 0;
- }
- return p;
+void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei){
+ return Decode(file, gb, wid, hei);
}
// pic encoder
@@ -133,3 +116,20 @@
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);
}
+
+void *c_ffmpeg_create_conv(const int srcW, const int srcH, const int srcFormat,
+ const int dstW, const int dstH, const int flag){
+ return CreateConvertor(srcW, srcH, srcFormat, dstW, dstH, flag);
+}
+
+void *c_ffmpeg_conv(void *h, uint8_t *in){
+ return Convert(h, in);
+}
+
+void c_ffmpeg_destroy_conv(void *h){
+ DestoryConvertor(h);
+}
+
+void* c_gpu_conv(uint8_t *in, const int w, const int h, const int dst_w, const int dst_h, int *length){
+ return ConvertYUV2BGR(in, w, h, dst_w, dst_h, length);
+}
\ No newline at end of file
--
Gitblit v1.8.0