From patchwork Sat Jun 29 22:34:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13763 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BDAE444A0BF for ; Sun, 30 Jun 2019 01:42:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 912DD689989; Sun, 30 Jun 2019 01:42:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 773BF6805C7 for ; Sun, 30 Jun 2019 01:42:07 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id z23so12202432wma.4 for ; Sat, 29 Jun 2019 15:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=msBxJltVjDg+LX03uaSDYzpBzs50B1Ypj20vD155H0M=; b=LmFZKLvxRFqFVIwREkTRLt6AN2xkoCZ+q2FDgqLDlVJfu6Svr86ULbOWd1SF1TSK++ pC7kpUfMepKywoQ2DHXrNZpimVnu+j3wYhsjqbWnYf7hntBO8zbwhKTfhztUT5TwNa0f TrETot4hpsw1Ts0UumCFurThJZ6IrZnCFcsNZZDaTahSphiY+Xs6It9TbhtDzIrk9myL c8WATX7UoqMMF+eX1jVoS756TvnznN9vgwqWJpx2bz3GdVox4+fQXIfeReHedYslRH1x zspCIj6Gl4xs9IMqn44GuzkyvslXdAOt1vBRpaZI4R9h2JKGzFwehq47qMe8RnphM+Fa bU4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=msBxJltVjDg+LX03uaSDYzpBzs50B1Ypj20vD155H0M=; b=rc9Zu6/Wnt7AvvJfUwLUBpvfsntA8hu+NCiOJZpgPnCfIho1EwJ6amsMJhHWiLOV0t y5+cEN1iDUVSMsxGN68HlOu+8ybU2wP2ptueIsnpgPkA6OdmNCuGLJPjMsGfgIlg/Zar rad9BIzpPydYpkuRS6QIskVOAOCi8SIkVdRhLVbo0I8rQma+FPxilxQFQrJO043xUZEz jNeO/IOxt/zlsho9+D+ANIxnAlzkIZK0VdLFS7/ccRX0sAO15UvAJrAmPay8jJ6danSI GLYvaKMPs/MuItQJjturoaDQXh3koPvVIU7o0eGbDkYFE8Q7sx1sdEiRUqAPwezKBLJi Brtw== X-Gm-Message-State: APjAAAWHN60yr9eYabxGaE7785l6On5s8URxHu462TaB5uV43qmyXIV3 0mOU4ZPQWu+coJJsTb7ie6JnbCUD X-Google-Smtp-Source: APXvYqzPxAgAxf2//yn5e1jYrCJecvDIY3ExUmGzq3c4EACO9L8011RnQ1rfugNqQpyhVBP8ATugzw== X-Received: by 2002:a05:600c:1150:: with SMTP id z16mr11122591wmz.168.1561847727614; Sat, 29 Jun 2019 15:35:27 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id c6sm5977998wma.25.2019.06.29.15.35.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 29 Jun 2019 15:35:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jun 2019 00:34:06 +0200 Message-Id: <20190629223406.36044-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: Integrate two checks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" For audio packets with dts != AV_NOPTS_VALUE the dts 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 --- fftools/ffmpeg.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 01f04103cf..755bc05bc1 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2044,20 +2044,18 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p else opkt.pts = AV_NOPTS_VALUE; - 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; - } + (AVRational){1, ist->dec_ctx->sample_rate}, duration, + &ist->filter_in_rescale_delta_last, ost->mux_timebase); + } 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);