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 | 47 +++++++++++++++++++++--------------------------
1 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 59f3f23..5ca0182 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -38,29 +38,24 @@
FormatIn::~FormatIn()
{
- if(ctx_){
- if (!(ctx_->flags & AVFMT_FLAG_CUSTOM_IO)){
- avformat_close_input(&ctx_);
- }else{
- avformat_free_context(ctx_);
- }
+ logIt("free format in");
+ if(dec_ctx_){
+ avcodec_close(dec_ctx_);
+ avcodec_free_context(&dec_ctx_);
+ dec_ctx_ = NULL;
+ }
+ if(ctx_){
+ avformat_close_input(&ctx_);
ctx_ = NULL;
- if(dec_ctx_){
- avcodec_close(dec_ctx_);
- dec_ctx_ = NULL;
- }
-
}
if (handle_gb28181){
delete handle_gb28181;
}
- if(read_io_buff_){
- av_free(read_io_buff_);
- read_io_buff_ = NULL;
- }
+
if(io_ctx_){
+ av_freep(&io_ctx_->buffer);
avio_context_free(&io_ctx_);
io_ctx_ = NULL;
}
@@ -89,11 +84,11 @@
ctx_->pb = io_ctx_;
- auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, 0);
- if(err != 0){
- logIt("open with custom io prob input buffer error:%d err: %s\n", err, getAVErrorDesc(err).c_str());
- return -1;
- }
+ // auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, 0);
+ // if(err != 0){
+ // logIt("open with custom io prob input buffer error:%d err: %s\n", err, getAVErrorDesc(err).c_str());
+ // return -1;
+ // }
return 0;
}
@@ -199,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