From 657185145236c12eb0fcf104b4712d8bb88efe16 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 19 十月 2019 11:04:27 +0800
Subject: [PATCH] bug fix
---
csrc/wrapper.cpp | 67 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 2643ce0..fe6d576 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -2,6 +2,7 @@
#include <thread>
#include <unistd.h>
+#include <sys/time.h>
extern "C"{
#include <libavformat/avformat.h>
@@ -159,14 +160,17 @@
}
}
- void Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
+ int Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
if (gb_){
AVPacket &pkt = data->getAVPacket();
pkt.pts = pkt.dts = AV_NOPTS_VALUE;
}
+ int flag = 0;
if (stream_) stream_->SetPacket(data, id);
- if (decoder_ && run_dec_) decoder_->SetFrame(data, id);
+ if (decoder_ && run_dec_) flag = decoder_->SetFrame(data, id);
if (rec_->Loaded()) rec_->SetPacket(data, id);
+
+ return flag;
}
void Wrapper::deinit_worker(){
@@ -185,7 +189,7 @@
sleep(2);
continue;
}
-
+
int wTime = 1000000.0 / in->getFPS() ;
wTime >>= 1;
logIt("WAIT TIME PER FRAME: %d", wTime);
@@ -193,6 +197,8 @@
init_worker(in.get());
int64_t id = gb_ ? 0 : -1;
+
+ bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
@@ -200,24 +206,33 @@
logIt("read packet error, id: %lld", id);
break;
}
-
if (in->notVideoAudio(&data->getAVPacket())){
continue;
}
-
+
if (!gb_ && id < 0){
id++;
continue;
}
-
- run_worker(in.get(), data, id);
- usleep(wTime);
+
+ // decode error
+ if (run_worker(in.get(), data, id) == -1){
+ break;
+ }
+
+ if (exist){
+ usleep(wTime);
+ }
id++;
}
deinit_worker();
}
+ }
+
+ void Wrapper::SetRecMinCacheTime(const int mind){
+ rec_->SetRecMinCacheTime(mind);
}
void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur, const bool audio){
@@ -325,8 +340,7 @@
if(in->decode(frm, &data->getAVPacket()) == 0){
*w = frm->width;
*h = frm->height;
- pic = (unsigned char*)malloc(frm->width * frm->height * 3);
- bridge_->copyPicture(pic, frm);
+ pic = bridge_->convert2Data(frm);
break;
}
}
@@ -388,14 +402,14 @@
PicEncoder *e = (PicEncoder*)hdl;
auto ctx = e->enc->getCodecContext();
+ AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
if (e->bridge == NULL){
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
e->bridge = new cvbridge(
w, h, AV_PIX_FMT_BGR24,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *frame = e->bridge->getAVFrame(in, w, h);
+ AVFrame *frame = cvbridge::fillFrame(in, w, h, pix_fmt);
AVPacket *pkt = av_packet_alloc();
auto flag = e->enc->encode(pkt, frame);
@@ -435,11 +449,11 @@
}Conv;
void *CreateConvertor(const int srcW, const int srcH, const int srcFormat,
- const int dstW, const int dstH, const int flag){
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
+ const int dstW, const int dstH, const int dstFormat, const int flag){
+
auto bridge = new cvbridge(
srcW, srcH, srcFormat,
- dstW, dstH, pix_fmt, flag);
+ dstW, dstH, dstFormat, flag);
if (!bridge) return NULL;
Conv *c = (Conv*)malloc(sizeof(Conv));
@@ -458,26 +472,13 @@
auto b = c->b;
- AVFrame *tmp_frm = av_frame_alloc();
- tmp_frm->format = (AVPixelFormat)c->srcF;
- tmp_frm->width = c->srcW;
- tmp_frm->height = c->srcH;
-
- //create a AVPicture frame from the opencv Mat input image
- int ret = avpicture_fill((AVPicture *)tmp_frm,
- (uint8_t *)src,
- (AVPixelFormat)tmp_frm->format,
- tmp_frm->width,
- tmp_frm->height);
+ AVFrame *tmp_frm = cvbridge::fillFrame(src, c->srcW, c->srcH, c->srcF);
+ if (!tmp_frm) return NULL;
- unsigned char *picData = NULL;
- if (ret > 0){
- picData = (unsigned char*)malloc(c->dstW * c->dstH * 3);
- b->copyPicture(picData, tmp_frm);
- }
-
+ unsigned char *picData = b->convert2Data(tmp_frm);
+
av_frame_free(&tmp_frm);
-
+
return picData;
}
--
Gitblit v1.8.0