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 44649457FB for ; Wed, 24 May 2023 12:01:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA6ED68C06D; Wed, 24 May 2023 15:01:33 +0300 (EEST) Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16FFE680274 for ; Wed, 24 May 2023 15:01:27 +0300 (EEST) Received: by mail-oa1-f41.google.com with SMTP id 586e51a60fabf-19e7008a20aso71013fac.1 for ; Wed, 24 May 2023 05:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684929685; x=1687521685; 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=r8sIVdl9j7sCyLQ+EE9d//yPQdaNkhAwb623RVGYKvo=; b=DNK+AVYFvQWinxvkbfnh7S7sqEsy93uYor1c4vXD/Laookd7owCOYgfZ41p7yx3AdX CQE3niV3iajZdUNnFVXgesw3aVzazKoBtBk8wy7XwU8UORSzWFaJ9gnAbToEJgDLa/yc VGO9k+egUWNsFkfAs85ADWng4DswvoYtKaWvW96QLjMtSmtnGi7Sia3yKOOeBtylhag3 btKrpv1lG4KU7aFWVysMf9ITZYfFqHAq7wuIVDGwhfGrAqNsjEU4X3bKvaCV6PfUEAmK lxUqdOYti3yeetgsA9ATpl1POj19yA6N7rNyQC0DbioRIjPIWNXZ1Rhe900B7SVe7oYC NN7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684929685; x=1687521685; 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=r8sIVdl9j7sCyLQ+EE9d//yPQdaNkhAwb623RVGYKvo=; b=MuDpBt5TEZbBuw1OSB9/VNhTdHKkl7Mbu6UbK0zFmoR40bsQZCaNPYnKE0JRE5tbdF hDDGKmW12rqZnKZL3XXqKs1vUxuQkqUycBsmxehj0KHAJw2TC/XponU3p5SNnodLEyuM jY7myqXheiLGQJdwPgcq5wwuL072INBdbD5/dvPLXEaDFEvhYYgyeNaZw0gM0j0fkrK1 N/7T0nebDXnSXO6XCwNilGarOh7OJ/sHuoSF5kJQeN0++4I+LMJLJSLoiEBPNzuOm4nX BNqDiu/syC94ihPPE/NPhoy0TMFOjWL6TdJp7D/jmQU83o3Rx2kndUBeAkNgd33YUcME 3iyA== X-Gm-Message-State: AC+VfDxUmDY5m3hlKpSDnjAeKx5pXzBtONMsBQHCWq47iKm/5zNvMaJE lP1jyJoFjYI1eQdaoYTKXVeARVwRzTs= X-Google-Smtp-Source: ACHHUZ6Fiu5POSU8r4a02Ck46ODtV+ZkgpS1I7fFxqXCgkrBIUH6VSA2jKA2wb5PS/jlzc/PXD++hg== X-Received: by 2002:a05:6870:85c6:b0:19a:6e17:87a with SMTP id g6-20020a05687085c600b0019a6e17087amr7507981oal.33.1684929684575; Wed, 24 May 2023 05:01:24 -0700 (PDT) Received: from [192.168.0.12] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y139-20020a4a4591000000b00541fbbbcd31sm4896744ooa.5.2023.05.24.05.01.22 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 May 2023 05:01:23 -0700 (PDT) Message-ID: <7a958426-cf78-9c69-b6b8-a182f38fd1d9@gmail.com> Date: Wed, 24 May 2023 09:01:47 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 To: ffmpeg-devel@ffmpeg.org References: <20230523135842.20388-1-anton@khirnov.net> <20230523135842.20388-15-anton@khirnov.net> Content-Language: en-US From: James Almer In-Reply-To: <20230523135842.20388-15-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 15/15] fftools/sync_queue: make sure non-limiting streams are not used as queue head 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 5/23/2023 10:58 AM, Anton Khirnov wrote: > A non-limiting stream could mistakenly end up being the queue head, > which would then produce incorrect synchronization, seen e.g. in > fate-matroska-flac-extradata-update for certain number of frame threads > (e.g. 5). > > Found-By: James Almer Strictly speaking, it was FATE. > --- > fftools/sync_queue.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/fftools/sync_queue.c b/fftools/sync_queue.c > index c0f33e9235..bc107ba4fe 100644 > --- a/fftools/sync_queue.c > +++ b/fftools/sync_queue.c > @@ -217,17 +217,26 @@ static void finish_stream(SyncQueue *sq, unsigned int stream_idx) > > static void queue_head_update(SyncQueue *sq) > { > + av_assert0(sq->have_limiting); > + > if (sq->head_stream < 0) { > + unsigned first_limiting = UINT_MAX; > + > /* wait for one timestamp in each stream before determining > * the queue head */ > for (unsigned int i = 0; i < sq->nb_streams; i++) { > SyncQueueStream *st = &sq->streams[i]; > - if (st->limiting && st->head_ts == AV_NOPTS_VALUE) > + if (!st->limiting) > + continue; > + if (st->head_ts == AV_NOPTS_VALUE) > return; > + if (first_limiting == UINT_MAX) > + first_limiting = i; > } > > // placeholder value, correct one will be found below > - sq->head_stream = 0; > + av_assert0(first_limiting < UINT_MAX); > + sq->head_stream = first_limiting; > } > > for (unsigned int i = 0; i < sq->nb_streams; i++) { Can confirm it fixes the issue. _______________________________________________ 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".