From f238d052479dbbe0a8d97e231ff74984bf748903 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 19 十一月 2019 09:13:11 +0800
Subject: [PATCH] update
---
csrc/wrapper.cpp | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 6e067d9..dc511fa 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -370,14 +370,11 @@
int br;
int gi;
int flag;
- int fmt;
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 fmt, const char *file){
-
- if (fmt < 0) return NULL;
+ const int scale_flag, const int gi){
PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
e->enc = NULL;
@@ -387,7 +384,6 @@
e->br = br;
e->gi = gi;
e->flag = scale_flag;
- e->fmt = fmt;
e->bridge = NULL;
VideoProp prop_;
@@ -397,10 +393,7 @@
prop_.bit_rate_ = br;
gi < 0 ? prop_.gpu_acc_ = false : prop_.gpu_acc_ = true;
- std::string filename("./88.mp4");
- if (file) filename = file;
-
- FormatOut *enc = new FormatOut(prop_, filename.c_str());
+ FormatOut *enc = new FormatOut(prop_, "./88.mp4");
e->enc = enc;
return e;
@@ -423,14 +416,13 @@
PicEncoder *e = (PicEncoder*)hdl;
auto ctx = e->enc->getCodecContext();
- // AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
if (e->bridge == NULL){
e->bridge = new cvbridge(
- w, h, e->fmt,
+ w, h, AV_PIX_FMT_BGR24,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, e->fmt);
+ AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, AV_PIX_FMT_BGR24);
AVFrame *frame = e->bridge->convert2Frame(bgr_frame);
av_frame_free(&bgr_frame);
--
Gitblit v1.8.0