From e6725cb3cf4ced3a6985d4d3db4d5cf1336a30d8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 19 七月 2019 16:53:35 +0800
Subject: [PATCH] merge so
---
csrc/ffmpeg/format/FormatOut.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.cpp b/csrc/ffmpeg/format/FormatOut.cpp
index 3837dbc..d319969 100644
--- a/csrc/ffmpeg/format/FormatOut.cpp
+++ b/csrc/ffmpeg/format/FormatOut.cpp
@@ -160,6 +160,9 @@
if(prop.gpuAccl()){
av_opt_set(enc_ctx_->priv_data, "preset", "llhp", 0);
int idle_gpu = gpu::getGPU(120);
+ if (prop.gpu_index_ > -1){
+ idle_gpu = prop.gpu_index_;
+ }
if(idle_gpu < 0){
logIt("NO GPU RESOURCE TO ENCODE");
return false;
--
Gitblit v1.8.0