From 5dc20e14010d1cf87db73ddd0de2de452049e542 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 28 九月 2019 16:33:18 +0800
Subject: [PATCH] add rec h265
---
csrc/ffmpeg/format/FormatIn.cpp | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index eeb9621..25d9e3a 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -57,6 +57,7 @@
avcodec_close(dec_ctx_);
dec_ctx_ = NULL;
}
+
}
if (handle_gb28181){
delete handle_gb28181;
@@ -154,11 +155,11 @@
vs_idx_ = i;
auto in = ctx_->streams[i];
- if(in->avg_frame_rate.num >=1 && in->avg_frame_rate.den >= 1){
- fps_ = av_q2d(in->avg_frame_rate);
- }else if(in->r_frame_rate.num >=1 && in->r_frame_rate.den >= 1){
+ if(in->r_frame_rate.num >=1 && in->r_frame_rate.den >= 1){
fps_ = av_q2d(in->r_frame_rate);
- }
+ }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);
}
if (type == AVMEDIA_TYPE_AUDIO){
@@ -172,6 +173,10 @@
}
return true;
+ }
+
+ const bool FormatIn::IsHEVC()const{
+ return ctx_->streams[vs_idx_]->codecpar->codec_id == AV_CODEC_ID_HEVC;
}
bool FormatIn::openCodec(AVDictionary **options){
@@ -298,7 +303,9 @@
int FormatIn::readPacket(AVPacket *pkt_out){
- return av_read_frame(ctx_, pkt_out);
+ auto flag = av_read_frame(ctx_, pkt_out);
+
+ return flag;
}
int FormatIn::decode(AVFrame* frame, AVPacket *pkt){
--
Gitblit v1.8.0