From a4cfd08f442fbf6febf06c98bbbed1723aaf5fd4 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 28 九月 2019 11:03:24 +0800
Subject: [PATCH] change audio pts
---
csrc/ffmpeg/format/FormatOut.cpp | 54 +++++++++++++++++-------------------------------------
1 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.cpp b/csrc/ffmpeg/format/FormatOut.cpp
index 830e9ac..2994153 100644
--- a/csrc/ffmpeg/format/FormatOut.cpp
+++ b/csrc/ffmpeg/format/FormatOut.cpp
@@ -395,30 +395,6 @@
}
void FormatOut::adjustPTS(AVPacket *pkt, const int64_t &frame_cnt){
- if (pkt->stream_index >= ctx_->nb_streams){
- logIt("adjustPTS pkt stream index too much");
- return;
- }
-
- if (!in_a_stream_){
- 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;
int out_idx = -1;
std::vector<AVStream*> in_streams{in_v_stream_, in_a_stream_};
@@ -436,24 +412,28 @@
}
}
if (out_idx == -1) return;
-
out_stream = ctx_->streams[out_idx];
pkt->stream_index = out_idx;
+
+ int64_t time_stamp = frame_cnt;
+
+ if (out_idx == v_idx_){
- // 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);
+ pkt->pos = -1;
+ AVRational time_base = ctx_->streams[out_idx]->time_base;
- //杞崲 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));
- pkt->dts = av_rescale_q_rnd(pkt->dts, in_stream->time_base, out_stream->time_base, (enum AVRounding)(AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX));
- pkt->duration = av_rescale_q(pkt->duration, in_stream->time_base, out_stream->time_base);
- pkt->pos = -1;
+ AVRational time_base_q = { 1, AV_TIME_BASE };
+ int64_t calc_duration = (int64_t)(AV_TIME_BASE / fps_); //鍐呴儴鏃堕棿鎴�
+ 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);
+
+ }else if (out_idx == a_idx_){
- // logIt("AFTER stream %d, pts: %lld, dts: %lld, duration: %lld",
- // pkt->stream_index, pkt->pts, pkt->dts, pkt->duration);
+ pkt->duration = 1024;
+ pkt->pts = pkt->dts = pkt->duration * time_stamp;
+
+ }
}
bool FormatOut::writeFrame(AVPacket *pkt, const int64_t &frame_cnt,
--
Gitblit v1.8.0