From 02258ea3c79c03612aff0c248547543caaf95174 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 25 九月 2019 17:33:01 +0800
Subject: [PATCH] wait time
---
csrc/ffmpeg/format/FormatOut.cpp | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.cpp b/csrc/ffmpeg/format/FormatOut.cpp
index 6b6c38e..135590b 100644
--- a/csrc/ffmpeg/format/FormatOut.cpp
+++ b/csrc/ffmpeg/format/FormatOut.cpp
@@ -387,15 +387,36 @@
logIt("adjustPTS pkt stream index too much");
return;
}
+
+ if (pkt->pts == AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE){
+ int64_t time_stamp = frame_cnt;
+
+ pkt->pos = -1;
+ pkt->stream_index = 0;
+ //Write PTS
+ AVRational time_base = getStream()->time_base;
+
+ AVRational time_base_q = { 1, AV_TIME_BASE };
+ //Duration between 2 frames (us)
+ // int64_t calc_duration = (double)(AV_TIME_BASE)*(1 / fps_); //鍐呴儴鏃堕棿鎴�
+ int64_t calc_duration = (int64_t)(AV_TIME_BASE / fps_); //鍐呴儴鏃堕棿鎴�
+ //Parameters
+ pkt->pts = av_rescale_q(time_stamp*calc_duration, time_base_q, time_base);
+ pkt->dts = pkt->pts;
+ pkt->duration = av_rescale_q(calc_duration, time_base_q, time_base);
+ return;
+ }
AVStream *in_stream,*out_stream;
in_stream = in_ctx_->streams[pkt->stream_index];
out_stream = ctx_->streams[pkt->stream_index];
- // if (type == "audio")
- // logIt("BEFORE stream %d type: %s, pts: %lld, dts: %lld, duration: %lld",
- // pkt.stream_index, type.c_str(), pkt.pts, pkt.pts, pkt.duration);
+ // logIt("BEFORE in stream timebase %d:%d, out timebase %d:%d, \
+ // pts: %lld, dts: %lld, duration: %lld",
+ // in_stream->time_base.num, in_stream->time_base.den,
+ // out_stream->time_base.num, out_stream->time_base.den,
+ // pkt->pts, pkt->dts, pkt->duration);
//杞崲 PTS/DTS 鏃跺簭
pkt->pts = av_rescale_q_rnd(pkt->pts,in_stream->time_base,out_stream->time_base,(enum AVRounding)(AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX));
@@ -403,10 +424,8 @@
pkt->duration = av_rescale_q(pkt->duration, in_stream->time_base, out_stream->time_base);
pkt->pos = -1;
- // if (type == "audio")
- // logIt("AFTER stream %d type: %s, pts: %lld, dts: %lld, duration: %lld",
- // pkt.stream_index, type.c_str(), pkt.pts, pkt.pts, pkt.duration);
-
+ // logIt("AFTER stream %d, pts: %lld, dts: %lld, duration: %lld",
+ // pkt->stream_index, pkt->pts, pkt->dts, pkt->duration);
}
bool FormatOut::writeFrame(AVPacket *pkt, const int64_t &frame_cnt,
--
Gitblit v1.8.0