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/worker/decoder.hpp | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/csrc/worker/decoder.hpp b/csrc/worker/decoder.hpp
index a1946bd..7f87180 100644
--- a/csrc/worker/decoder.hpp
+++ b/csrc/worker/decoder.hpp
@@ -22,27 +22,19 @@
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_;
-
- 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