From b8c69e1f08f748dd19da3637f23bf680ad14b0ec Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 29 十一月 2019 13:30:38 +0800
Subject: [PATCH] update
---
csrc/wrapper.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index af25ea4..d1cbfbf 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -202,7 +202,7 @@
int64_t v_id = id;
int64_t a_id = id;
- bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
+ bool exist = access(input_url_.c_str(), 0) == 0;
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
@@ -307,12 +307,13 @@
int fps;
int br;
int gi;
+ int pix_fmt;
int flag;
cvbridge *bridge;
} PicEncoder;
void *CreateEncoder(const int w, const int h, const int fps, const int br,
- const int scale_flag, const int gi){
+ const int pix_fmt, const int scale_flag, const int gi){
PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
e->enc = NULL;
@@ -321,6 +322,7 @@
e->fps = fps;
e->br = br;
e->gi = gi;
+ e->pix_fmt = pix_fmt;
e->flag = scale_flag;
e->bridge = NULL;
@@ -356,11 +358,11 @@
if (e->bridge == NULL){
e->bridge = new cvbridge(
- w, h, AV_PIX_FMT_BGR24,
+ w, h, e->pix_fmt,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, AV_PIX_FMT_BGR24);
+ AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, e->pix_fmt);
AVFrame *frame = e->bridge->convert2Frame(bgr_frame);
av_frame_free(&bgr_frame);
--
Gitblit v1.8.0