From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1A2B64BED8 for ; Mon, 2 Feb 2026 16:40:27 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'IWfMBv0Iiq0T75tdbwMynBd193NB0JVskbqlbWzFBuA=', expected b'Mv2VPmcAq4vfjTrFpw+uUNOV0dBeSAukGxByHKlYG8o=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1770050420; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=IWfMBv0Iiq0T75tdbwMynBd193NB0JVskbqlbWzFBuA=; b=M9s/ZPULsHpbuQmL88fL4Z9yed6iRrKPUUwgo7AbqVYNfvffRKtSxL7aU9MZW/4i1iV4K 5IU/ISyuuGiUUigJa1qcQo6Dq8xdxM0/bw/JTEHgR1q7jLSSGDk+7wee7zTrYz7nIQrOw+h PBYP+LWhKfM1cKAkItZ6Os+QIAEYOGs4LOUJghys/9aW1dVh7M7cKRu0CvwMN0uNFJFBH8s g1RfP+G9ZtvvsifOFKqaAij72SbLAGR74jTroOX4s41lXdpL0M1UKP1zCSPAL1N9w7K+WJF DBJFP5CSuHqA+edCPDiFJwAswdolWkxbztWdK7p62PZwC+4t3QTgGwpDsdYg== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 974756910C0; Mon, 2 Feb 2026 18:40:20 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1770050407; b=btB6H88ZmfInOPxoUV6TrBUhjjVyd3+W41xFvpoS//e9VBA6VKgEGxpyzb4s2aU6mPthy +/ANditt6exYEXI6z1QYsFHAL9k4iKmO0tE7TgYmtkr7PPwaX2UTirSqj07TWtIkSuABu9y l0nHooYptUIOsDToIMmN9MU5sA5UmqKw3+ENsg05HHNIKgAhDBEWUeNC1H0pO1iG8yOgT9T zN4vv5e/ISY8NVKFyZ8olkNYwulUklpxfy3jYX4KNY/Ff/TxNOW/NM3kzFcdq8ijsA+GplB /rKB46pAuYAF4N1S2HPP/4jDhW6Hue/ShwON16Zb7wrAGzquobkEihU8R2ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1770050407; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=CJX3NXN55LV7DUAwak+L7+7zoU1qQqjsTjp6JNqtAsA=; b=SGYC1XiKpa+c57wgS6Anzjdry2NjbwDcLxpZY/VOIKwtw9peTJ/LL5wltT30xkQFvyHWA tFTVegH4CazsQYr91rGzMs3szssa0IhEg65oNZkuzP/FScpy+JUF1ug9gBcspxNtxk3CvLb BBzZgYGstLHHuzhhwzskUBS1Sovl8tRkFsg0Kos8yNMq3N79y1P2lI3Oufdx18lWu6h6WSV kaoYH1hEM3a3k+FcLTSqs9sxeCfamNQAzEGkKnryEda0BI3MvO3Z7RQjC6YuFj97rPc6MQC kkNSmxj062eAp3NSLfG5c1T/EGAFMzkw1XstYjWF4xkVpHB8IoGCgw1u6HEA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1770050399; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=Mv2VPmcAq4vfjTrFpw+uUNOV0dBeSAukGxByHKlYG8o=; b=5QN2TQWsoo4BwJ7NfWMM/eaMVdIDoxnzkaidstlu3/6hXcS5v/RefzgYYs9Li1pbSrjrc 4O+cIlA72dBty2FGxymWjTy2LfpUaIkRbM6yfw5/dAktCXqclQlRvld/G7IHy3rmE6xpyKq SE9UnCSdmH/WexhiW3UUW8ojggbUdYc3UQvIWlnZGGSZUU3qQYFd4cfq07a9JMHkXCRJZo8 KP9TQs2YWZFHgIRa9IHo44neIXoDhLMylImttUAIe5P5e9oz61t6huilCq4IQTykexyT5U+ /498DKCHMrLvff/heuVbbAj3iETpooogWDRMhntOotM4rqMBff1t4O5ftRLA== Received: from c8d966988b92 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id DC140690E7E for ; Mon, 2 Feb 2026 18:39:59 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 02 Feb 2026 16:39:59 -0000 Message-ID: <177005040004.25.5962270867379966212@4457048688e7> Message-ID-Hash: NU2XZCEGRSC47KQEWEGYDC5RW7ONZWKX X-Message-ID-Hash: NU2XZCEGRSC47KQEWEGYDC5RW7ONZWKX X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] avformat/demux: don't overwrite already set packet durations with parser ones (PR #21628) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21628 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21628 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21628.patch Following up on b613eebe78de, if a demuxer that exports complete frames sets a duration, don't overwrite it from the output of the parser. >>From e4cc536f99d0fce8b962361c6d7878c076d62823 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 2 Feb 2026 13:38:07 -0300 Subject: [PATCH] avformat/demux: don't overwrite already set packet durations with parser ones Following up on b613eebe78de, if a demuxer that exports complete frames sets a duration, don't overwrite it from the output of the parser. Signed-off-by: James Almer --- libavformat/demux.c | 2 +- tests/ref/fate/matroska-encoding-delay | 2 +- tests/ref/fate/matroska-flac-channel-mapping | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index c68334e1ab..db8f14ad0d 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1265,7 +1265,7 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, /* set the duration */ out_pkt->duration = (sti->parser->flags & PARSER_FLAG_COMPLETE_FRAMES) ? pkt->duration : 0; if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { - if (sti->avctx->sample_rate > 0 && sti->parser->duration > 0) { + if (sti->avctx->sample_rate > 0 && !out_pkt->duration && sti->parser->duration > 0) { out_pkt->duration = av_rescale_q_rnd(sti->parser->duration, (AVRational) { 1, sti->avctx->sample_rate }, diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay index cfa1675b94..31d00882a4 100644 --- a/tests/ref/fate/matroska-encoding-delay +++ b/tests/ref/fate/matroska-encoding-delay @@ -21,7 +21,7 @@ ece637ed28526724c88f5c69b8bf7d6f *tests/data/fate/matroska-encoding-delay.matros 1, 86, 86, 24, 1152, 0xc9e85398 1, 110, 110, 24, 1152, 0xda1287d3 0, 120, 120, 40, 238290, 0xbe18b18f -1, 134, 134, 24, 1152, 0x1c9a6102 +1, 134, 134, 16, 1152, 0x1c9a6102 [PACKET] codec_type=audio stream_index=1 diff --git a/tests/ref/fate/matroska-flac-channel-mapping b/tests/ref/fate/matroska-flac-channel-mapping index 25627d6570..91a778853f 100644 --- a/tests/ref/fate/matroska-flac-channel-mapping +++ b/tests/ref/fate/matroska-flac-channel-mapping @@ -16,16 +16,16 @@ 1, 4096, 4096, 4096, 26, 0x50d30416 0, 8192, 8192, 4096, 26, 0x51ee046f 1, 8192, 8192, 4096, 26, 0x51ee046f -0, 12288, 12288, 4096, 26, 0x521d0458 -1, 12288, 12288, 4096, 26, 0x521d0458 +0, 12288, 12288, 4097, 26, 0x521d0458 +1, 12288, 12288, 4097, 26, 0x521d0458 0, 16385, 16385, 4096, 26, 0x531c043d 1, 16385, 16385, 4096, 26, 0x531c043d 0, 20481, 20481, 4096, 26, 0x53cf0442 1, 20481, 20481, 4096, 26, 0x53cf0442 0, 24577, 24577, 4096, 26, 0x536a0473 1, 24577, 24577, 4096, 26, 0x536a0473 -0, 28673, 28673, 4096, 26, 0x5321046c -1, 28673, 28673, 4096, 26, 0x5321046c +0, 28673, 28673, 4097, 26, 0x5321046c +1, 28673, 28673, 4097, 26, 0x5321046c 0, 32770, 32770, 4096, 26, 0x51b00449 1, 32770, 32770, 4096, 26, 0x51b00449 0, 36866, 36866, 4096, 26, 0x518b042e -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org