From ac5446e6f58db4c556b30d4917e6af2bf5c2b29b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 23 十月 2019 16:40:16 +0800
Subject: [PATCH] recover
---
csrc/worker/decoder.cpp | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/csrc/worker/decoder.cpp b/csrc/worker/decoder.cpp
index d421d37..558d871 100644
--- a/csrc/worker/decoder.cpp
+++ b/csrc/worker/decoder.cpp
@@ -53,37 +53,8 @@
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];
- }
- free(tmp);
- }else{
- return 0;
- }
- frm.data = data;
+ frm.data = cvbridge::extractFrame(frame, &frm.length);
+
std::lock_guard<std::mutex> l(mutex_frm_);
while(list_frm_.size() > 50){
for(int i = 0; i < 12; i++){
--
Gitblit v1.8.0