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 | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index eea69f8..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){
@@ -29,11 +31,6 @@
void c_ffmpeg_run(const cffmpeg h, const char *input){
Wrapper *s = (Wrapper*)h;
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){
@@ -88,10 +85,10 @@
s->BuildDecoder();
}
-void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int64_t *id){
+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, id);
+ s->GetPicDecoder(&data, wid, hei, format, length, id);
return data;
}
@@ -103,12 +100,8 @@
}
/////////////////////test
-void* c_ffmpeg_decode_jpeg(const char *file, int *wid, int *hei){
- uint8_t *p = 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
@@ -123,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