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.cpp | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/csrc/worker/decoder.cpp b/csrc/worker/decoder.cpp
index d421d37..805356e 100644
--- a/csrc/worker/decoder.cpp
+++ b/csrc/worker/decoder.cpp
@@ -20,10 +20,14 @@
{
decoder::decoder(ffwrapper::FormatIn *dec)
:decRef_(dec)
+ ,conv_(NULL)
{}
decoder::~decoder(){
-
+ if (conv_){
+ delete conv_;
+ conv_ = NULL;
+ }
std::lock_guard<std::mutex> l(mutex_frm_);
for(auto i : list_frm_){
free(i.data);
@@ -48,42 +52,32 @@
}
int decoder::saveFrame(AVFrame *frame, const int64_t &id){
- FRM frm;
- frm.width = frame->width;
- frm.height = frame->height;
- frm.format = frame->format;
- frm.id = id;
- uint8_t *tmp = cvbridge::extractFrame(frame, &frm.length);
- uint8_t *data = NULL;
- if (frame->format == AV_PIX_FMT_YUV420P){
- data = tmp;
- }else if (frame->format == AV_PIX_FMT_NV12){
- data = (uint8_t*)malloc(frm.length);
-
- int i, j;
- int y_size = frame->width * frame->height;
-
- unsigned char* y = tmp;
- unsigned char* uv = tmp + y_size;
-
- unsigned char* y_tmp = data;
- unsigned char* u_tmp = data + y_size;
- unsigned char* v_tmp = data + y_size * 5 / 4;
-
- // y
- memcpy(y_tmp, y, y_size);
-
- // uv
- for (j = 0, i = 0; j < y_size/2; j+=2, i++)
- {
- u_tmp[i] = uv[j];
- v_tmp[i] = uv[j+1];
+ AVFrame *cFrame = NULL;
+ bool conv = false;
+ if (frame->format != AV_PIX_FMT_NV12){
+ if (!conv_){
+ conv_ = new cvbridge(
+ frame->width, frame->height, frame->format,
+ frame->width, frame->height, AV_PIX_FMT_NV12);
}
- free(tmp);
- }else{
- return 0;
+ if (conv_){
+ cFrame = conv_->convert2Frame(frame);
+ if (!cFrame) return -1;
+ conv = true;
+ }
}
- frm.data = data;
+ AVFrame * rFrame = frame;
+ if (conv && cFrame) rFrame = cFrame;
+
+ FRM frm;
+ frm.width = rFrame->width;
+ frm.height = rFrame->height;
+ frm.format = rFrame->format;
+ frm.id = id;
+ frm.data = cvbridge::extractFrame(rFrame, &frm.length);
+
+ if (conv && cFrame) av_frame_free(&cFrame);
+
std::lock_guard<std::mutex> l(mutex_frm_);
while(list_frm_.size() > 50){
for(int i = 0; i < 12; i++){
--
Gitblit v1.8.0