From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 695AB48F4E for ; Sun, 31 Mar 2024 16:30:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A43B68CBED; Sun, 31 Mar 2024 19:30:26 +0300 (EEST) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5C6268C0CB for ; Sun, 31 Mar 2024 19:30:19 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1e0025ef1efso21657905ad.1 for ; Sun, 31 Mar 2024 09:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711902617; x=1712507417; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=/CfrvNBPGOkwnBpduPIQ7WbDtKEVS6OWnZ1LqMvehqc=; b=Hk8SYZC9nXFoo9bUY8MUyrg+QOjh/DZ1M8Th7XnXqEYqsvh4Kf7QzpjK2NbpGkoQ47 hZVrL7V/6jRtps178uJ2p6o27ZkC7+I/fdp0jrPXIP/UsEHb68UI6bI8iyJ8acLQjmCU 9rsEH/Js9Gzs0yKQRyKxWwlU8hsMVnvm8chOGExhWM1L9f5SVEGRYeNLiuO6gbgyudAN R02U/tcf6Vz6TpbY86JPEdR38RodaqfSpCmLF2XpdCNUyywuzi+0y9El8zVbhwl5QO3e o3UBfUTK8G1tYs4ejrrZAhhnEe6ZNJo0A9gJ6oKGh09SyQeBvPdnsRWRqZBoyXH9qcDh +6cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711902617; x=1712507417; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/CfrvNBPGOkwnBpduPIQ7WbDtKEVS6OWnZ1LqMvehqc=; b=fGXhr4H7oliRzjQlHkyZ8FPK8xwedueineAdcX/hWTpGGUEZivNzrRsjmNpj6ZvtzJ Q2fM5KKKnqgvHfSSLcf7c4QJxwQ6dXBWd8m3cEuO5Gi3490r6Y7Ml3vamAJ0A4ruYUE+ yMN3QRcutV2xiGtDTP35jIbV+IMzqj+vEMDbvG+/QzVe9Y/ZhGaDj8RVNNsP3ZSsXd73 5cHbRGyyOcr9sLB85/pbmIgi/RhwIIdmuF6wLuySal8njU7YV0hcfyvQNg2eecNLhYYM UxXuUFeRbLyb6XtUXOFrqlL2i0V4geXh4/w9VbwlJFfDo+bcyWP27Six8gNaVTlyDkSB r9Ig== X-Gm-Message-State: AOJu0YzvHIql7K9NKAHypEl3TxHfa2tbH8dWPS+f0iXwKmiS8B0nbD1L v5pIMul/xMubhzQRsAbj9OkVSebcQ5maXbkYpLQXTqRS2wz/Cwh8eeYEgHk+ X-Google-Smtp-Source: AGHT+IGm+penVHdF3E0joo+axUV+NDd3Guw51sxVJsKE0zPw5ziABvKwBpvAHM6cQq6jMYqsDp2mEw== X-Received: by 2002:a17:902:ba8d:b0:1dd:c7fc:2b16 with SMTP id k13-20020a170902ba8d00b001ddc7fc2b16mr5599962pls.68.1711902616504; Sun, 31 Mar 2024 09:30:16 -0700 (PDT) Received: from [192.168.0.15] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id ld3-20020a170902fac300b001dc05537e10sm7055617plb.236.2024.03.31.09.30.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 31 Mar 2024 09:30:15 -0700 (PDT) Message-ID: <6aa524e2-8686-4cc7-883c-30d281d9bcb0@gmail.com> Date: Sun, 31 Mar 2024 13:30:26 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240331114019.3801-1-michael@niedermayer.cc> Content-Language: en-US From: James Almer In-Reply-To: <20240331114019.3801-1-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH] avformat/movenc: Check that cts fits in 32bit 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/31/2024 8:40 AM, Michael Niedermayer wrote: > Fixes: Assertion av_rescale_rnd(start_dts, mov->movie_timescale, track->timescale, AV_ROUND_DOWN) <= 0 failed at libavformat/movenc.c:3694 > Fixes: poc2 > > Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory > Signed-off-by: Michael Niedermayer > --- > libavformat/movenc.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > index ae94d8d5959..5617a2620c5 100644 > --- a/libavformat/movenc.c > +++ b/libavformat/movenc.c > @@ -6194,6 +6194,12 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) > if (ret < 0) > return ret; > > + if (pkt->pts != AV_NOPTS_VALUE && > + (uint64_t)pkt->dts - pkt->pts != (int32_t)((uint64_t)pkt->dts - pkt->pts)) { > + av_log(s, AV_LOG_WARNING, "pts/dts pair unsupported\n"); > + return AVERROR_PATCHWELCOME; > + } Any such check should happen in check_pkt(), called directly above. And afaict there's no reason to not support 64bit cts. Even in mov_write_edts_tag() we check for it and write a version 1 of the box that supports 64bit values. Maybe the problem is that MOVIentry.cts is an int, when it should be an int64_t like start_cts? Can you test the following? > diff --git a/libavformat/movenc.h b/libavformat/movenc.h > index 08d580594d..e736c92750 100644 > --- a/libavformat/movenc.h > +++ b/libavformat/movenc.h > @@ -49,11 +49,11 @@ typedef struct MOVIentry { > uint64_t pos; > int64_t dts; > int64_t pts; > + int64_t cts; > unsigned int size; > unsigned int samples_in_chunk; > unsigned int chunkNum; ///< Chunk number if the current entry is a chunk start otherwise 0 > unsigned int entries; > - int cts; > #define MOV_SYNC_SAMPLE 0x0001 > #define MOV_PARTIAL_SYNC_SAMPLE 0x0002 > #define MOV_DISPOSABLE_SAMPLE 0x0004 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".