From bc3239dc0121d046d0f2c59cbf0208136a552e22 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 25 五月 2020 11:26:38 +0800
Subject: [PATCH] bug fixed
---
csrc/ffmpeg/format/FormatIn.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 5ca0182..32b9525 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -159,7 +159,7 @@
}else if(in->avg_frame_rate.num >=1 && in->avg_frame_rate.den >= 1){
fps_ = av_q2d(in->avg_frame_rate);
}
- logIt("in stream video fps %f, time_base: %d : %d", fps_, in->time_base.num, in->time_base.den);
+ logIt("in stream video fps %f, time_base: %d : %d, size: %dx%d", fps_, in->time_base.num, in->time_base.den, in->codecpar->width, in->codecpar->height);
}
if (type == AVMEDIA_TYPE_AUDIO){
auto in = ctx_->streams[i];
@@ -194,7 +194,8 @@
for (int i = 0; i < 2; ++i)
{
if(hw_accl_){
- idle_gpu = gpu::getGPUPrior(300, 1024, 0);
+ // idle_gpu = gpu::getGPUPrior(300, 1024, 0);
+ idle_gpu = gpu::getGPU(300);
if(idle_gpu < 0){
logIt("NO GPU RESOURCE TO DECODE");
hw_accl_ = false;
--
Gitblit v1.8.0