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 | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 9d0c679..dc511fa 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -24,6 +24,7 @@
#include "worker/stream.hpp"
#include "worker/decoder.hpp"
#include "worker/rec.hpp"
+#include "common.hpp"
using namespace logif;
using namespace ffwrapper;
@@ -51,6 +52,7 @@
,decoder_(nullptr)
,rec_(new rec)
,logit_(false)
+ ,fps_(25)
{
makeTheWorld();
}
@@ -158,15 +160,15 @@
}
}
- int Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
+ int Wrapper::run_worker(ffwrapper::FormatIn *in, const CPacket &pkt){
if (gb_){
- AVPacket &pkt = data->getAVPacket();
- pkt.pts = pkt.dts = AV_NOPTS_VALUE;
+ AVPacket &p = pkt.data->getAVPacket();
+ p.pts = p.dts = AV_NOPTS_VALUE;
}
int flag = 0;
- if (stream_) stream_->SetPacket(data, id);
- if (decoder_ && run_dec_) flag = decoder_->SetFrame(data, id);
- if (rec_->Loaded()) rec_->SetPacket(data, id);
+ if (stream_) stream_->SetPacket(pkt);
+ if (decoder_ && run_dec_) flag = decoder_->SetFrame(pkt);
+ if (rec_->Loaded()) rec_->SetPacket(pkt);
return flag;
}
@@ -188,6 +190,8 @@
continue;
}
+ fps_ = in->getFPS();
+
int wTime = 1000000.0 / in->getFPS() ;
wTime >>= 1;
logIt("WAIT TIME PER FRAME: %d", wTime);
@@ -195,7 +199,9 @@
init_worker(in.get());
int64_t id = gb_ ? 0 : -1;
-
+ int64_t v_id = id;
+ int64_t a_id = id;
+
bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
while(!stop_stream_.load()){
@@ -204,25 +210,34 @@
logIt("read packet error, id: %lld", id);
break;
}
+ // 闈為煶瑙嗛
if (in->notVideoAudio(&data->getAVPacket())){
continue;
}
-
+ // 闈炲浗鏍囪烦杩囩涓�甯�,娴嬭瘯绗竴甯ф湁闂
if (!gb_ && id < 0){
- id++;
+ id++; v_id++; a_id++;
continue;
}
-
+ CPacket pkt{data, v_id, a_id, id};
// decode error
- if (run_worker(in.get(), data, id) == -1){
+ if (run_worker(in.get(), pkt) == -1){
break;
}
+ if (in->isVideoPkt(&data->getAVPacket())){
+ v_id++;
+ }else{
+ a_id++;
+ }
+
+ id++;
+
+ //鏈湴鏂囦欢澶揩sleep涓�涓�
if (exist){
usleep(wTime);
}
- id++;
}
deinit_worker();
@@ -236,7 +251,7 @@
void Wrapper::BuildRecorder(const char* id, const char *output, const int64_t &fid, const int mindur, const int maxdur, const bool audio){
bool a = audio;
if (gb_) a = false;
-
+
if (rec_->Loaded()){
rec_->NewRec(id, output, fid, mindur, maxdur, a);
}else{
@@ -358,7 +373,8 @@
cvbridge *bridge;
} PicEncoder;
- void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi){
+ void *CreateEncoder(const int w, const int h, const int fps, const int br,
+ const int scale_flag, const int gi){
PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
e->enc = NULL;
@@ -400,14 +416,16 @@
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, AV_PIX_FMT_BGR24,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *frame = cvbridge::fillFrame(in, w, h, pix_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);
+
AVPacket *pkt = av_packet_alloc();
auto flag = e->enc->encode(pkt, frame);
--
Gitblit v1.8.0