From d9952f61a53b693a75490e4932d7136e14e7dc08 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 01 九月 2020 15:22:05 +0800
Subject: [PATCH] bug fixed
---
csrc/wrapper.cpp | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 8ca7b16..e0aef2d 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -45,6 +45,7 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
@@ -66,6 +67,7 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
@@ -108,8 +110,9 @@
prop.url_ = input;
prop.rtsp_tcp_ = true;
prop.gpu_acc_ = !cpu_;
+ prop.gpu_index_ = devid_;
- std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
+ std::unique_ptr<FormatIn> in(new FormatIn(prop, prop.gpuAccl()));
int flag = -1;
if (gb_){
flag = in->openGb28181(input, NULL);
@@ -222,7 +225,7 @@
bool exist = access(input_url_.c_str(), 0) == 0;
if (exist){
- wTime <<= 1;
+ wTime += wTime/2;
file_rebootime++;
}
@@ -233,10 +236,6 @@
if (in->readPacket(&data->getAVPacket()) != 0){
logIt("read packet error, id: %lld", id);
break;
- }
- if (exist){
- // 璁板綍瑙ｇ爜鐨勬枃浠舵湁澶氬皯甯�
- file_frame++;
}
// 闈為煶瑙嗛
if (in->notVideoAudio(&data->getAVPacket())){
@@ -263,7 +262,9 @@
id++;
//鏈湴鏂囦欢澶揩sleep涓�涓�
- if (exist){
+ if (exist && in->isVideoPkt(&data->getAVPacket())){
+ // 璁板綍瑙ｇ爜鐨勬枃浠舵湁澶氬皯甯�
+ file_frame++;
usleep(wTime);
}
--
Gitblit v1.8.0