From e878e92811a2dbfb6b4d3f7b2c357435f56e28db Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期日, 29 九月 2019 10:27:21 +0800
Subject: [PATCH] add trytime
---
csrc/ffmpeg/format/FormatIn.cpp | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 4399822..9f743f8 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -86,8 +86,7 @@
auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, read_io_buff_size_);
if(err != 0){
- logIt("open with custom io prob input buffer error:%d\n", err);
- logIt("custom io failed:%s", getAVErrorDesc(err).c_str());
+ logIt("open with custom io prob input buffer error:%d err: %s\n", err, getAVErrorDesc(err).c_str());
return -1;
}
@@ -155,11 +154,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){
--
Gitblit v1.8.0