From patchwork Fri Jul 5 10:42:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4215102vqv; Fri, 5 Jul 2024 03:43:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWHrjIeywRO51sMyRlmRSAX2F9lzqTc9QEJvZ9fVq3Cfpkj2mMNeolgWDjSwFg6I5qMINUhJ4Mrh3OskAVcMY5BP2m8WI7yDxLH3w== X-Google-Smtp-Source: AGHT+IHBeFi26K0fz8Pbo0TtQSoSEVmm1iDh4HFl6SF8DHke5jSjINqCNwwzRG+pn2Xurehel9Xe X-Received: by 2002:a17:906:eb56:b0:a6f:b715:6cd9 with SMTP id a640c23a62f3a-a77ba70a7ddmr311673066b.56.1720176194597; Fri, 05 Jul 2024 03:43:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720176194; cv=none; d=google.com; s=arc-20160816; b=MCD9W3PGWoFbq4QEn/JgB1CKFAQ1BRNvnIXVlEwoB1woFQ3r0RTCAhb4Itya5oT9FU 8fszZ2Apm/ozoBH4fB3PR9L4TdqO1oiNlQg0cg3DuXCL/z2OpS8LZnzC6PEv4tjlPPyu Q/jwF7vDHxv9GlSfhabht6fTswlcejGrXEWC4phHbAzB3KiMOFPOqEqe+vDpOW0aLvRD c/b5nY/F0YpgHOB5COkX+TnukxW1RQiYsLspI07vMneHBxvCYtGsLfniozTSY3RnpxZ6 /d859z0YulJ4JnU8alqQF3/BH0lWSlruZXdzmZ71rFWxezwYVAb4ZsJXOIasc+tia53B JyDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=eUzJdGpLnl85CoA8myTIiM86tdp3cVMFy+mgl22R6w8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=boFhMJrfBP6MMKIkMhPmx8svEMrvYREIDcWJB7iyvb745IVzd+XYy1PcnsJBq+fdnW yY2eQhGpptYhg85eVtf4ooOLiG7bHnI37+PF1f+hNhjWrmRlTVxAWhM02zyWZPEUwJiQ vl8SmkA9pKlEJ2QCbwOva6yaPAsfsh2n7ADsanODvcyG5VhiQp8+TUnTFI+IFNhtn2ec d4oT7sSTW6CnGVZS1C2bcfSUuy7Caj9BrKxSWeAJI1gVQqqL7uDbrTncXGUWdL2PeB5V dFywWzoOzSnSp+ljoDH7pahEMjIXGVreVeqZJ82ghI8oRtiJzoclSnyVwYYwgmq+fIF9 5PYw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=nllhWuKl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a77ce7c9e12si51973866b.896.2024.07.05.03.43.13; Fri, 05 Jul 2024 03:43:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=nllhWuKl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E7B968DB46; Fri, 5 Jul 2024 13:42:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A50A868DAF7 for ; Fri, 5 Jul 2024 13:42:39 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=nllhWuKl; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 23BBB4DE4 for ; Fri, 5 Jul 2024 12:42:38 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 7tKcC0gmgMOA for ; Fri, 5 Jul 2024 12:42:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1720176156; bh=F/jW6sarzoJgERrNXTwbOniVV8EI/dkXlONELjzsYVU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=nllhWuKlrRD/b2CO2rSvWZyjfUf0f+qnVR+CZfbvkBjGh2CV6pVTtArGWG5rwZh+e E4kkOa6Z6aWZha1AbLi+JrvCkwk4Qh0/RQhV6eztU+4mb7uR2QkgrBIFnwJzZMNqn7 JOx+SyMoZLi79vsmo3uAcSLjpWrcBoD11P3fKCXcpP8RT48zCN7U+kBQGAz7Kfrkac 6zshDzZYNXGE/AdddjN4gZyaHPmrrNSmJiLKkM0d2RJP/oKkiGbfB7F4YjLdLUgHzm zptBxee1j2bFxjByx5SRWXqpiC3Y3ETCsfL85HPwD3X8FtCp4RlL1wv0d/4vxKMGHH Vu0Hd2ofdbtSw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id E34B14D76 for ; Fri, 5 Jul 2024 12:42:36 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BE2193A031C for ; Fri, 05 Jul 2024 12:42:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jul 2024 12:42:32 +0200 Message-ID: <20240705104233.6703-2-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240705104233.6703-1-anton@khirnov.net> References: <20240705104233.6703-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] fftools/ffmpeg_mux_init: default to input timebase for streamcopy X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kW31bbKtuECn Stop trying to invent some "framerate-based" timebase when there is no reason to think the stream is CFR at all. --- fftools/ffmpeg_mux_init.c | 7 +------ tests/fate/ffmpeg.mak | 2 +- tests/ref/fate/copy-trac4914-avi | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 899ee6046f..4a2b5924a4 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -960,17 +960,12 @@ static int streamcopy_init(const Muxer *mux, OutputStream *ost, AVDictionary **e else ost->st->avg_frame_rate = ist->st->avg_frame_rate; - ret = avformat_transfer_internal_stream_timing_info(mux->fc->oformat, - ost->st, ist->st, copy_tb); - if (ret < 0) - goto fail; - // copy timebase while removing common factors if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) { if (fr.num) ost->st->time_base = av_inv_q(fr); else - ost->st->time_base = av_add_q(av_stream_get_codec_timebase(ost->st), (AVRational){0, 1}); + ost->st->time_base = av_add_q(ist->st->time_base, (AVRational){0, 1}); } if (!ms->copy_prior_start) { diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index dc102750a0..9e0c68da20 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -146,7 +146,7 @@ fate-copy-trac236: CMD = transcode mov $(TARGET_SAMPLES)/mov/fcp_export8-236.mov FATE_STREAMCOPY-$(call TRANSCODE, RAWVIDEO MPEG2VIDEO, MXF, MPEGTS_DEMUXER MPEGVIDEO_PARSER MPEGAUDIO_PARSER MP2_DECODER ARESAMPLE_FILTER PCM_S16LE_DECODER) += fate-copy-trac4914 fate-copy-trac4914: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/xdcam8mp2-1s_small.ts\ - mxf "-c:a pcm_s16le -af aresample -c:v copy" + mxf "-c:a pcm_s16le -af aresample -c:v copy -time_base 1001/30000" FATE_STREAMCOPY-$(call TRANSCODE, RAWVIDEO MPEG2VIDEO, AVI, MPEGTS_DEMUXER MPEGVIDEO_PARSER MPEGAUDIO_PARSER EXTRACT_EXTRADATA_BSF MP2_DECODER ARESAMPLE_FILTER) += fate-copy-trac4914-avi fate-copy-trac4914-avi: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/xdcam8mp2-1s_small.ts\ diff --git a/tests/ref/fate/copy-trac4914-avi b/tests/ref/fate/copy-trac4914-avi index 20006ea05c..d598e0aa65 100644 --- a/tests/ref/fate/copy-trac4914-avi +++ b/tests/ref/fate/copy-trac4914-avi @@ -1,5 +1,5 @@ -26e4202638bc384b82d2b5eb4d33a5f0 *tests/data/fate/copy-trac4914-avi.avi -479494 tests/data/fate/copy-trac4914-avi.avi +3b6f31b806ef421652a066f239536b0d *tests/data/fate/copy-trac4914-avi.avi +492046 tests/data/fate/copy-trac4914-avi.avi #tb 0: 1001/30000 #media_type 0: video #codec_id 0: rawvideo