From 69895028b74737228e76005f88b9aaf95136ec96 Mon Sep 17 00:00:00 2001 From: chenshijun <csj_sky@126.com> Date: 星期一, 29 七月 2019 11:49:08 +0800 Subject: [PATCH] 析构时,deleteCamera增加handle置位的操作,防止重复关闭报错 --- 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