From 0560a8fce4c9d005655fce5025bc0fda8c58bff8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 02 十二月 2019 16:15:47 +0800
Subject: [PATCH] update

---
 csrc/ffmpeg/bridge/cvbridge.hpp |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/csrc/ffmpeg/bridge/cvbridge.hpp b/csrc/ffmpeg/bridge/cvbridge.hpp
index 565d509..60dfd60 100644
--- a/csrc/ffmpeg/bridge/cvbridge.hpp
+++ b/csrc/ffmpeg/bridge/cvbridge.hpp
@@ -22,18 +22,15 @@
 		~cvbridge();
 	
 	public:
-		bool copyPicture(uint8_t *out, AVFrame *in);
+		uint8_t* convert2Data(AVFrame *in);
+		AVFrame* convert2Frame(AVFrame *in);
 
-		bool getAVFrame(uint8_t *in, const int w, const int h, AVFrame * &output);
-		AVFrame *getAVFrame(uint8_t *in, const int w, const int h);
-
-		AVFrame *getAVFrame(AVFrame *in);
-		bool getAVFrame(AVFrame *in, AVFrame * &output);
+		static AVFrame *fillFrame(uint8_t *in, const int w, const int h, const int f);
+		static uint8_t* extractFrame(AVFrame *in, int *length);
 
 	private:
 		ffwrapper::swscale_wrapper 		*scale_;
 		ffwrapper::PicData 				*pic_;
-		uint8_t 						*buff_fill_;
 
 	};
 	

--
Gitblit v1.8.0