From 0560a8fce4c9d005655fce5025bc0fda8c58bff8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 02 十二月 2019 16:15:47 +0800
Subject: [PATCH] update
---
csrc/ffmpeg/format/FormatIn.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 376c9de..5ca0182 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -194,17 +194,17 @@
for (int i = 0; i < 2; ++i)
{
if(hw_accl_){
- idle_gpu = gpu::getGPU(100);
+ idle_gpu = gpu::getGPUPrior(300, 1024, 0);
if(idle_gpu < 0){
logIt("NO GPU RESOURCE TO DECODE");
hw_accl_ = false;
continue;
}
- if(codecpar->codec_id == AV_CODEC_ID_H264){
- dec = avcodec_find_decoder_by_name("h264_cuvid");
- }else if(codecpar->codec_id == AV_CODEC_ID_H265){
- dec = avcodec_find_decoder_by_name("hevc_cuvid");
- }
+
+ std::string codec_name(avcodec_get_name(codecpar->codec_id));
+ codec_name += "_cuvid";
+ dec = avcodec_find_decoder_by_name(codec_name.c_str());
+
if(!dec){
hw_accl_ = false;
continue;
--
Gitblit v1.8.0