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/worker/decoder.hpp |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/csrc/worker/decoder.hpp b/csrc/worker/decoder.hpp
index a2f226f..7f87180 100644
--- a/csrc/worker/decoder.hpp
+++ b/csrc/worker/decoder.hpp
@@ -18,33 +18,23 @@
 {
     class FormatIn;
     class CodedData;
-    class cvbridge;
 } // namespace ffwrapper
 
 namespace cffmpeg_wrap
 {
-    typedef struct _frm{
-        uint8_t *data;
-        int length;
-        int width;
-        int height;
-        int format;
-        int64_t id;
-    }FRM;
-
     class decoder
     {
     private:
 
         ffwrapper::FormatIn *decRef_;
-        ffwrapper::cvbridge *conv_;
         
-        std::list<FRM> list_frm_;
-        std::mutex mutex_frm_;
+        std::list<CPacket> list_pkt_;
+        std::mutex mutex_pkt_;
         
+        int64_t next_idx_;
+
     private:
         int initDecoder();
-        int saveFrame(AVFrame *frame, const int64_t &id);
     public: 
         void Start();
         int SetFrame(const CPacket &pkt);

--
Gitblit v1.8.0