From e878e92811a2dbfb6b4d3f7b2c357435f56e28db Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期日, 29 九月 2019 10:27:21 +0800
Subject: [PATCH] add trytime
---
csrc/wrapper.cpp | 76 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 3ad04cb..c03b54f 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -46,13 +46,35 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,run_dec_(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
,decoder_(nullptr)
,rec_(new rec)
+ ,logit_(false)
{
makeTheWorld();
+ }
+
+ Wrapper::Wrapper(const char *logfile)
+ :input_url_("")
+ ,scale_w_(0)
+ ,scale_h_(0)
+ ,scale_f_(SWS_POINT)
+ ,audio_(false)
+ ,gb_(0)
+ ,cpu_(0)
+ ,run_dec_(false)
+ ,thread_(nullptr)
+ ,stop_stream_(false)
+ ,stream_(nullptr)
+ ,decoder_(nullptr)
+ ,rec_(new rec)
+ ,logit_(true)
+ {
+ makeTheWorld();
+ logif::CreateLogger(logfile, true);
}
@@ -70,6 +92,8 @@
{
logIt("WRAPPER EXCEPTION: ", e.what());
}
+ if (logit_)
+ logif::DestroyLogger();
}
std::unique_ptr<ffwrapper::FormatIn> Wrapper::init_reader(const char* input){
@@ -119,28 +143,34 @@
void Wrapper::AudioSwitch(const bool a){
audio_ = a;
- if (stream_){
- stream_->AudioSwitch(a);
- }
+ // if (stream_){
+ // stream_->AudioSwitch(a);
+ // }
}
void Wrapper::init_worker(ffwrapper::FormatIn *in){
if (rec_->Loaded() && stream_ && decoder_) return;
- stream_ = new stream(in, 3 * 25);
- stream_->AudioSwitch(audio_);
+ stream_ = new stream(in, 3 * in->getFPS());
+ // stream_->AudioSwitch(audio_);
decoder_ = new decoder(in, scale_w_, scale_h_, scale_f_);
rec_->Load(in);
- if(fn_rec_lazy_) fn_rec_lazy_(in);
+ if(fn_rec_lazy_) {
+ fn_rec_lazy_();
+ fn_rec_lazy_ = nullptr;
+ }
}
void 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;
+ }
if (stream_) stream_->SetPacket(data, id);
+ if (decoder_ && run_dec_) decoder_->SetFrame(data, id);
if (rec_->Loaded()) rec_->SetPacket(data, id);
- if (decoder_) decoder_->SetFrame(data, id);
}
void Wrapper::deinit_worker(){
@@ -156,22 +186,32 @@
if (!in) {
logIt("ERROR: init_reader! url: %s\n", input_url_.c_str());
- usleep(200000);
+ sleep(2);
continue;
}
int wTime = 1000000.0 / in->getFPS() ;
wTime >>= 1;
- logIt("INPUT FPS: %d", wTime);
+ logIt("WAIT TIME PER FRAME: %d", wTime);
init_worker(in.get());
- int64_t id = 0;
+ int64_t id = gb_ ? 0 : -1;
+
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
if (in->readPacket(&data->getAVPacket()) != 0){
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);
@@ -185,13 +225,15 @@
}
void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur, const bool audio){
-
+ bool a = audio;
+ if (gb_) a = false;
+
if (rec_->Loaded()){
- rec_->NewRec(id, output, mindur, maxdur, audio);
+ rec_->NewRec(id, output, mindur, maxdur, a);
}else{
std::string rid(id), dir(output);
fn_rec_lazy_ =
- [=](ffwrapper::FormatIn *in){rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, audio);};
+ [=]{rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, a);};
}
}
@@ -208,7 +250,7 @@
}
////////decoder
void Wrapper::BuildDecoder(){
- // use_decoder_ = true;
+ run_dec_ = true;
}
void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id){
@@ -216,7 +258,7 @@
decoder_->GetFrame(data, w, h, id);
}
}
-
+
void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
if (stream_){
stream_->GetPacket(pktData, size, key);
@@ -275,7 +317,7 @@
uint8_t *pic = NULL;
*w = *h = 0;
-
+
int tryTime = 0;
while (tryTime++ < 100){
--
Gitblit v1.8.0