From f29f269d999fc4bb8a9bfa85629f08b89971a2ef Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:00:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/cffmpeg.cpp | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 029816d..fc92229 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -62,6 +62,10 @@
//////passive api
+void c_ffmpeg_open_recorder(const cffmpeg h){
+ Wrapper *s = (Wrapper*)h;
+ s->OpenRecorder();
+}
void c_ffmpeg_set_record_duration(const cffmpeg h, const int min, const int max){
Wrapper *s = (Wrapper*)h;
s->SetRecMinCacheTime(min);
@@ -104,7 +108,7 @@
void c_ffmpeg_build_decoder(const cffmpeg h){
Wrapper *s = (Wrapper*)h;
- s->BuildDecoder();
+ s->OpenDecoder();
}
void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id){
@@ -114,6 +118,11 @@
return data;
}
+void c_ffmpeg_close_stream(const cffmpeg h){
+ Wrapper *s = (Wrapper*)h;
+ s->CloseStream();
+}
+
void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key){
Wrapper *s = (Wrapper*)h;
unsigned char *data = NULL;
@@ -121,14 +130,9 @@
return data;
}
-/////////////////////test
-void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei){
- return Decode(file, gb, wid, hei);
-}
-
// 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_create_encoder(const int w, const int h, const int fps, const int br, const int pix_fmt, const int scale_flag, const int gi){
+ return CreateEncoder(w, h, fps, br, pix_fmt, scale_flag, gi);
}
void c_ffmpeg_destroy_encoder(void *h){
@@ -137,17 +141,4 @@
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 dstFormat, const int flag){
- return CreateConvertor(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flag);
-}
-
-void *c_ffmpeg_conv(void *h, uint8_t *in){
- return Convert(h, in);
-}
-
-void c_ffmpeg_destroy_conv(void *h){
- DestoryConvertor(h);
}
--
Gitblit v1.8.0