From 7fe46306ac577db11ba8a8bbf20653861fcb1a1a Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 22 十月 2019 15:31:29 +0800
Subject: [PATCH] rec bug fix
---
csrc/wrapper.cpp | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 9d0c679..721d366 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;
@@ -158,15 +159,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;
}
@@ -195,7 +196,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 +207,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 +248,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{
--
Gitblit v1.8.0