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

---
 cffmpeg.h |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cffmpeg.h b/cffmpeg.h
index c794216..ccc21a6 100644
--- a/cffmpeg.h
+++ b/cffmpeg.h
@@ -15,7 +15,6 @@
 void c_ffmpeg_destroy(const cffmpeg h);
 void c_ffmpeg_run(const cffmpeg h, const char *input);
 
-void c_ffmpeg_scale(const cffmpeg h, const int wid, const int hei, const int flags);
 void c_ffmpeg_run_gb28181(const cffmpeg h);
 void c_ffmepg_use_cpu(const cffmpeg h);
 /////////passive api
@@ -24,10 +23,10 @@
 void c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen);
 
 void c_ffmpeg_build_decoder(const cffmpeg h);
-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);
 void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key);
 
-//////test
+//////decoder
 void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei);
 
 // pic encoder
@@ -35,6 +34,15 @@
 void c_ffmpeg_destroy_encoder(void *h);
 int c_ffmpeg_encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
 
+// conv cpu
+void *c_ffmpeg_create_conv(const int srcW, const int srcH, const int srcFormat,
+                          const int dstW, const int dstH, const int flag);
+void c_ffmpeg_destroy_conv(void *h);
+void *c_ffmpeg_conv(void *h, uint8_t *in);
+
+// gpu conv
+void* c_gpu_conv(uint8_t *in, const int w, const int h, const int dst_w, const int dst_h, int *length);
+
 #ifdef __cplusplus
 }
 #endif

--
Gitblit v1.8.0