On Sat, Oct 12, 2019 at 5:18 AM Andreas Rheinhardt <
andreas.rheinha...@gmail.com> wrote:
> For audio packets with dts != AV_NOPTS_VALUEs the dts was converted
> twice to the muxer's timebase during streamcopy, once as a normal
> packet and once specifically as an audio packet. This has been changed.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
> ---
> fftools/ffmpeg.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> index 8e408c808a..314d590734 100644
> --- a/fftools/ffmpeg.c
> +++ b/fftools/ffmpeg.c
> @@ -2046,20 +2046,20 @@ static void do_streamcopy(InputStream *ist,
> OutputStream *ost, const AVPacket *p
> if (pkt->pts != AV_NOPTS_VALUE)
> opkt.pts = av_rescale_q(pkt->pts, ist->st->time_base,
> ost->mux_timebase) - ost_tb_start_time;
>
> - if (pkt->dts == AV_NOPTS_VALUE)
> + if (pkt->dts == AV_NOPTS_VALUE) {
> opkt.dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q,
> ost->mux_timebase);
> - else
> - opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base,
> ost->mux_timebase);
> - opkt.dts -= ost_tb_start_time;
> -
> - if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && pkt->dts
> != AV_NOPTS_VALUE) {
> + } else if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
> int duration = av_get_audio_frame_duration(ist->dec_ctx,
> pkt->size);
> if(!duration)
> duration = ist->dec_ctx->frame_size;
> - opkt.dts = opkt.pts = av_rescale_delta(ist->st->time_base,
> pkt->dts,
> - (AVRational){1,
> ist->dec_ctx->sample_rate}, duration, &ist->filter_in_rescale_delta_last,
> - ost->mux_timebase) -
> ost_tb_start_time;
> - }
> + opkt.dts = av_rescale_delta(ist->st->time_base, pkt->dts,
> + (AVRational){1,
> ist->dec_ctx->sample_rate}, duration,
> + &ist->filter_in_rescale_delta_last,
> ost->mux_timebase);
> + /* dts will be set immediately afterwards to what pts is now */
> + opkt.pts = opkt.dts - ost_tb_start_time;
> + } else
> + opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base,
> ost->mux_timebase);
> + opkt.dts -= ost_tb_start_time;
>
> opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base,
> ost->mux_timebase);
>
> --
> 2.21.0
>
>
Ping.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
