From 080acae08ec8cfe413c3e6e45bcf7f9222dfa02d Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 24 十月 2019 16:50:28 +0800
Subject: [PATCH] update
---
csrc/worker/decoder.hpp | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/csrc/worker/decoder.hpp b/csrc/worker/decoder.hpp
index 94bbb03..a1946bd 100644
--- a/csrc/worker/decoder.hpp
+++ b/csrc/worker/decoder.hpp
@@ -12,6 +12,8 @@
struct AVFrame;
struct AVCodecContext;
+class CPacket;
+
namespace ffwrapper
{
class FormatIn;
@@ -21,7 +23,11 @@
namespace cffmpeg_wrap
{
typedef struct _frm{
- AVFrame *frm;
+ uint8_t *data;
+ int length;
+ int width;
+ int height;
+ int format;
int64_t id;
}FRM;
@@ -36,10 +42,10 @@
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