From 0d5ec550ad724aac0a019a5cd619330af7cbc572 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 21 十一月 2019 16:47:36 +0800
Subject: [PATCH] updte
---
csrc/worker/decoder.hpp | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/csrc/worker/decoder.hpp b/csrc/worker/decoder.hpp
index 94bbb03..a2f226f 100644
--- a/csrc/worker/decoder.hpp
+++ b/csrc/worker/decoder.hpp
@@ -12,16 +12,23 @@
struct AVFrame;
struct AVCodecContext;
+class CPacket;
+
namespace ffwrapper
{
class FormatIn;
class CodedData;
+ class cvbridge;
} // namespace ffwrapper
namespace cffmpeg_wrap
{
typedef struct _frm{
- AVFrame *frm;
+ uint8_t *data;
+ int length;
+ int width;
+ int height;
+ int format;
int64_t id;
}FRM;
@@ -30,16 +37,17 @@
private:
ffwrapper::FormatIn *decRef_;
-
+ ffwrapper::cvbridge *conv_;
+
std::list<FRM> list_frm_;
std::mutex mutex_frm_;
private:
int initDecoder();
- int saveFrame(AVFrame *frame, int64_t &id);
+ int saveFrame(AVFrame *frame, const int64_t &id);
public:
void Start();
- int SetFrame(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id);
+ int SetFrame(const CPacket &pkt);
void GetFrame(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
public:
--
Gitblit v1.8.0