From patchwork Mon Jul 1 21:04:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13792 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 9353F4499F2 for ; Tue, 2 Jul 2019 00:13:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6754168A8C7; Tue, 2 Jul 2019 00:13:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF8C5689F2B for ; Tue, 2 Jul 2019 00:13:02 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id x4so15335200wrt.6 for ; Mon, 01 Jul 2019 14:13:02 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=4ZSPJpytgtQou8k2taPj3yjUP85j909eO4QERUaVtHM=; b=aX5pKnhLIribE20LELTK6kjVlJT0DW4NxO2zchv1OJIgaPX8bMQvkGgCV74DWs/06d ywsVtqDXIdqH8IviYIi5ymvomuy8V9R0km45JTq5+pwAvoZTg83giBeAQwUQwWLkRH20 HE7avqXbq+W8d9UN/ttp4z3pxPdPVx5bY5DD+BxbMuyAWNF5ptjP3H2UaRra8x+JofHQ Ke5oiNz5sAn8sUFOjXhzHcywW7kNY8BHwpY84WTt9pdqtuUXpqBFDDdPoKThHgBMRBhJ PejpffHEP0KPaLbKPS6HhZsrapPjkwAvhRKnODnySMkfUrQJQCTG5ia8Qs0UlFZoZDS1 Dvdw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=4ZSPJpytgtQou8k2taPj3yjUP85j909eO4QERUaVtHM=; b=BKQyt10kUMCk+NsBKyTOxZj32stE69zssOTec4SfJpDUjWe8/706h7J1nnH57dK+Xw UOTB+f84AJ/RRCtLZ7uelpXN68bldGmpKJ/You76NINE/7CZMKgH6rQGe9vwExYwqqyr h+Ys9tFXcMcGnjy7X2Dmdi5LT0U4AcOSlE8nfKzu3sP03B6BgyYXaN9qHLXGdQNBvL1y pOjh2I9AEZGkCY4aVMmZWwqP5/iYIkyUfBjZJHn5Sdm0DegK4RcBI9QHV/yYv0+dqn3V 3Vb7ItBG2jWpZupjHObn+wGxUeuQajPagmaPGfr6mK5OfnJTKc+iLIuVIGgtHp73zHcw nK2w== X-Gm-Message-State: APjAAAWdbPPZtMirZcH/wP4bfW/6uxqkz6+jr1l/QtOja7tItVjp+JYa K1s4KvDGydt/3FSj+DX4Em+LtGni X-Google-Smtp-Source: APXvYqxHYxngKI84g9EXxxvd/D9SBhRhHgnESPwL2Is/xOT57HleXcjqaP8gQuvxmwFfB0z+JrVNEg== X-Received: by 2002:adf:f591:: with SMTP id f17mr21196651wro.119.1562015097622; Mon, 01 Jul 2019 14:04:57 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id l14sm351214wrn.15.2019.07.01.14.04.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 01 Jul 2019 14:04:56 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2019 23:04:43 +0200 Message-Id: <20190701210443.2614-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190701163516.GT3118@michaelspb> References: <20190701163516.GT3118@michaelspb> 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 --- You are right. Seems that this is not covered by fate. fftools/ffmpeg.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 01f04103cf..f81b1b3983 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2044,20 +2044,19 @@ 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; - } + 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); + 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);