From f93ee1a42e8c47e472332287b7350b66a6b0fa11 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 24 七月 2020 18:28:57 +0800
Subject: [PATCH] 保存触发id之后的视频作为触发视频

---
 csrc/ffmpeg/format/FormatIn.cpp |   68 +++++++++++++++++----------------
 1 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 420c9ac..28b473b 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -38,38 +38,32 @@
 
 	FormatIn::~FormatIn()
 	{
-		if(io_ctx_){
-			if(read_io_buff_){
-				read_io_buff_ = NULL;
-			}
-			avio_context_free(&io_ctx_);
-			io_ctx_ = NULL;
+		logIt("free format in");
+		if(dec_ctx_){
+			avcodec_close(dec_ctx_);
+			avcodec_free_context(&dec_ctx_);
+			dec_ctx_ = NULL;
 		}
+
 		if(ctx_){
-			if (!ctx_->oformat){
-				avformat_free_context(ctx_);
-			}else{
-				avformat_close_input(&ctx_);
-			}
+			avformat_close_input(&ctx_);
 			ctx_ = NULL;
-			if(dec_ctx_){
-				avcodec_close(dec_ctx_);
-				dec_ctx_ = NULL;
-			}
-			
 		}
+		
 		if (handle_gb28181){
 			delete handle_gb28181;
 		}
+
+		if(io_ctx_){
+			av_freep(&io_ctx_->buffer);
+			av_freep(&io_ctx_);
+			io_ctx_ = NULL;
+		}
+
 	}
 
 ////////////////////////////////////////////////////////////////////////
 	int FormatIn::openWithCustomIO(void *opaque, read_packet fn, AVDictionary **options/*=NULL*/){
-		ctx_ = avformat_alloc_context();
-		if(!ctx_){
-			logIt("open with custom io create format error\n");
-			return -1;
-		}
 		read_io_buff_ = (uint8_t*)av_malloc(read_io_buff_size_);
 		if(!read_io_buff_){
 			logIt("open with custom io alloc read io buff error\n");
@@ -81,13 +75,20 @@
 			logIt("open with custom io create custom avio error\n");
 			return -1;
 		}
-		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());
+		
+		ctx_ = avformat_alloc_context();
+		if(!ctx_){
+			logIt("open with custom io create format error\n");
 			return -1;
 		}
+
+		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;
+		// }
 
 		return 0;
 	}
@@ -158,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];
@@ -193,17 +194,18 @@
 		for (int i = 0; i < 2; ++i)
 		{
 			if(hw_accl_){
-                idle_gpu = gpu::getGPU(100);
+                // 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;
                     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