From 68a19a73681301c6712e10d55bc64324716dbd24 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 09 十月 2019 15:38:47 +0800
Subject: [PATCH] split scale
---
csrc/worker/decoder.cpp | 106 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 54 deletions(-)
diff --git a/csrc/worker/decoder.cpp b/csrc/worker/decoder.cpp
index ce5f631..67af0a1 100644
--- a/csrc/worker/decoder.cpp
+++ b/csrc/worker/decoder.cpp
@@ -17,27 +17,17 @@
namespace cffmpeg_wrap
{
- decoder::decoder(ffwrapper::FormatIn *dec, const int w, const int h, const int f)
- :conv_(NULL)
- ,conv_w_(w)
- ,conv_h_(h)
- ,conv_flag_(f)
- ,decRef_(dec)
+ decoder::decoder(ffwrapper::FormatIn *dec)
+ :decRef_(dec)
{}
decoder::~decoder(){
- if (conv_){
- delete conv_;
+ std::lock_guard<std::mutex> l(mutex_frm_);
+ for(auto i : list_frm_){
+ av_frame_free(&i.frm);
}
-
- {
- std::lock_guard<std::mutex> l(mutex_pic_);
- for(auto &i : list_pic_){
- free(i.data);
- }
- list_pic_.clear();
- }
+ list_frm_.clear();
}
int decoder::initDecoder(){
@@ -47,17 +37,6 @@
bool flag = true;
flag = decRef_->openCodec(NULL);
- auto dec_ctx = decRef_->getCodecContext();
- if(conv_){
- delete conv_;
- conv_ = NULL;
- }
- conv_w_ = conv_w_ == 0 || conv_w_ > dec_ctx->width ? dec_ctx->width : conv_w_;
- conv_h_ = conv_h_ == 0 || conv_h_ > dec_ctx->height ? dec_ctx->height : conv_h_;
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
- conv_ = new cvbridge(
- dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
- conv_w_, conv_h_, pix_fmt, conv_flag_);
if (!flag){
logIt("FormatIn openCodec Failed!");
@@ -68,25 +47,15 @@
}
int decoder::saveFrame(AVFrame *frame, int64_t &id){
- //缂撳瓨鏁版嵁
- BGR24 pic;
- AVFrame *frm = frame;
- pic.w = conv_w_;
- pic.h = conv_h_;
- unsigned char *picData = (unsigned char*)malloc(pic.w * pic.h * 3);
- conv_->copyPicture(picData, frm);
- pic.data = picData;
- pic.id = id;
- std::lock_guard<std::mutex> l(mutex_pic_);
- while(list_pic_.size() > 50){
+ while(list_frm_.size() > 50){
for(int i = 0; i < 12; i++){
- auto t = list_pic_.front();
- free(t.data);
- list_pic_.pop_front();
+ auto t = list_frm_.front();
+ av_frame_free(&t.frm);
+ list_frm_.pop_front();
}
}
- list_pic_.emplace_back(pic);
- return list_pic_.size();
+ list_frm_.push_back({frame,id});
+ return list_frm_.size();
}
int decoder::SetFrame(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
@@ -94,7 +63,7 @@
if (!data) return -1;
if (!decRef_->isVideoPkt(&data->getAVPacket())) return -2;
- if (!conv_){
+ if (decRef_->getCodecContext() == NULL){
if (initDecoder() != 0) return -3;
}
@@ -107,21 +76,50 @@
if (ret == 0){
saveFrame(frame, id);
}
- av_frame_free(&frame);
}
- void decoder::GetFrame(unsigned char **data, int *w, int *h, int64_t *id){
- std::lock_guard<std::mutex> l(mutex_pic_);
- if(list_pic_.empty()){
+ void decoder::GetFrame(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+
+ AVFrame *frm = NULL;
+ {
+ std::lock_guard<std::mutex> l(mutex_frm_);
+ if(list_frm_.empty()){
+ *data = NULL;
+ *w = *h = 0;
+ *id = -1;
+ return;
+ }
+ auto p = list_frm_.front();
+ list_frm_.pop_front();
+ frm = p.frm;
+ *id = p.id;
+ *w = frm->width;
+ *h = frm->height;
+ *format = frm->format;
+ }
+
+ *length = avpicture_get_size((enum AVPixelFormat)frm->format, frm->width, frm->height);
+ if (*length <= 0){
+ logIt("get raw frame data error");
*data = NULL;
- *w = 0;
- *h = 0;
+ *w = *h = 0;
+ *id = -1;
return;
}
- auto p = list_pic_.front();
- *data = p.data; *w = p.w; *h = p.h;
- *id = p.id;
- list_pic_.pop_front();
+
+ unsigned char *picData = (unsigned char*)malloc(*length);
+ auto ret = avpicture_layout((const AVPicture*)frm, (enum AVPixelFormat)frm->format, frm->width, frm->height, picData, *length);
+ av_frame_free(&frm);
+
+ if (ret < 0){
+ *data = NULL;
+ *w = *h = 0;
+ *id = -1;
+ free(picData);
+ return;
+ }
+
+ *data = picData;
}
} // namespace cffmpeg_wrap
--
Gitblit v1.8.0