From patchwork Mon Mar 11 16:14:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 46956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1322939pzb; Mon, 11 Mar 2024 09:14:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRs5/NA28XN+r4Ce5v7ALU7ejLVsEq4AeyEEkY7kaKmZX+eiZLxpntsMbiONc5aukem4oJ5A2SHcBttTfe9YrUveZAHF7m+bFdHg== X-Google-Smtp-Source: AGHT+IEiRJ9G9l8YxzTijd9cJL6/EExprtxViVWuppT4CZcDHUpsYYZKMjqR/VNpyZpryf0+7oN7 X-Received: by 2002:a2e:90d4:0:b0:2d4:22b6:2414 with SMTP id o20-20020a2e90d4000000b002d422b62414mr4266313ljg.51.1710173684030; Mon, 11 Mar 2024 09:14:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710173683; cv=none; d=google.com; s=arc-20160816; b=QZ2IVAJfJoocUly48ciTwEolm24WZZWByHyQXZeGDLegNI+nkWwXtD9GcukpM0vnpd /1/uYem439vbnrRVpiLd5IL1ugeguQFNkzaUbwOCwwpQkna8FtZSRo2JQ3E5wToSerMD r+3LjoR8RKpQMHUiT/e3AtoVKqvLTcJgaK4ZO6E+jB0qjIStQwtk8vFcDB/WnAc9Tu33 4xUhCb15Ul1uwyfT5YJ4BBoEQVqHZa9rFIonxk/I2HiN2/ok4gZ+kaZ62KuG+FDuWqtb ZzTZeBltsg15x1QwvfveQBkJcwda5oPoLyc2Lr7Tgvo/eLjOTpX2hzq6Yb8n341F8f0A I5RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=S6ylnHvRfTUtSEx2R+4o5tF0EQ10GscZUMjYTAW1MHI=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=Q8JWC2eMjr+jbhsGfMP9HO/DYTLumIFw5YtxG4ka/dC0wCY+S0n5mZrfsBI1zbh2Rp Uy4iMU8enCnvjuNO5SjEz++N0gS3sukbdDsVFYITfzJpcs/1oN6OI/4DJ7P3janKvPXk LlLQGTwDRmQY8ySRA/mJZg/u1nxq7ucMD89Cq2KIijVpes1UMdOA1ixJAXv6ME9ZG1AD rowygJsYo4ZOdcp20xebdcGCJFPHOKxeK3AW6BoscoN2IUI/Ap73IPfCUNBe4fhAFU0V Nwv3jTMU5tXIIT6GO+JzUjcCBKQQIsHIUEkIPEZkObE7T40s4mCCihkUyBwtyvepm+br ohHg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=g7mYoTHB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y2-20020a056402358200b00565acfc6c29si2802097edc.277.2024.03.11.09.14.43; Mon, 11 Mar 2024 09:14:43 -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=@gmail.com header.s=20230601 header.b=g7mYoTHB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7545168D097; Mon, 11 Mar 2024 18:14:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62B8668C33B for ; Mon, 11 Mar 2024 18:14:34 +0200 (EET) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-a45ecef71deso362077466b.2 for ; Mon, 11 Mar 2024 09:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710173673; x=1710778473; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9AaJFJoDMrkX27R5EVQf0N9oSqCw3Pc6EU40C4Gshvk=; b=g7mYoTHBJVWtJA7TSiCqrvHjky2e83k0amKb+R2436gPlHsNW2jiLBuu+EFlkc/WzL pnYaJMr+ZY2fNvrf0coNK7bbkRNLx/yb6ttIhGIgesAFwicsdskygRvGtOSDFJ/f71ue 9/7DSfZGcRjn2NhqzbxjvxskrIQQqWeuH1Vn+3gzV3oywoKOODLWpVD7KxTfYGiwKua0 gu5qbEIBoGrvPuhms7WeQAXvCrZtYdfPEXGH9izCbpNudZ6cr2n19oC3TEWEFM36nbXI fpHGb2ZSoELINKaFbQmCfivK+Vis3gVAFVtuOyR/e6wGM/945lTT9O+4Wb+bWbiCjx36 yOjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710173673; x=1710778473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9AaJFJoDMrkX27R5EVQf0N9oSqCw3Pc6EU40C4Gshvk=; b=iHKl2azPNzc+k0iQpJf+YzUNEIncRXqE8xV7RXYIkXTtJNXnorfW5M40yesd7yxl2s KmL1FZYZ3jJVOa/GTbR7uTciWs5dmAoT+g9wo2Bo4tvnSI+OTW9KGsfD8BTGOZWWs9yE fNfiykGiVXkLVgqB2LQ5krvEQxHPz77K2tvhojos44oySh8LqFAqdpsZ7QfQsRiQQR7E JCmeToEB2ebqWWviIs7D/oQmAiva5fkGy/yuGw+Zh5vDqKJrvPttHVO2S6PQK7WV3T7a Noly+EkNGkge8D/Db+EcY7u2elsMejGDC61x1e0pZ1FCFXr8tGp5HN3AxcFNgNGboegE aNaw== X-Gm-Message-State: AOJu0YytMwc3fFCT8BZkH25Uh68Yh2m90cydOBDOcLsZzc2J0R9IG93L QGTaU7osN/t6gN/3ZpUz7CdLhsx5QrP0A+520ru8X6ZeYnBOU6MQeIZNSef1 X-Received: by 2002:a17:906:eb11:b0:a44:46a:e904 with SMTP id mb17-20020a170906eb1100b00a44046ae904mr4577513ejb.50.1710173673045; Mon, 11 Mar 2024 09:14:33 -0700 (PDT) Received: from mariano ([188.210.239.79]) by smtp.gmail.com with ESMTPSA id bk2-20020a170906b0c200b00a44ef54b6b6sm2978226ejb.58.2024.03.11.09.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 09:14:32 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 51FB0BFCDA; Mon, 11 Mar 2024 17:14:31 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Mon, 11 Mar 2024 17:14:30 +0100 Message-Id: <20240311161431.323249-2-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240311161431.323249-1-stefasab@gmail.com> References: <20240311161431.323249-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavf/fifo: fix check on last_recovery_ts 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gvVSnEljSatT Correct check on PTS nullness. --- libavformat/fifo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index a3d41ba0d3..fcd80f217a 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -345,7 +345,7 @@ static int fifo_thread_attempt_recovery(FifoThreadContext *ctx, FifoMessage *msg AV_NOPTS_VALUE : 0; } else { if (fifo->recovery_wait_streamtime) { - if (ctx->last_recovery_ts == AV_NOPTS_VALUE) { + if (ctx->last_recovery_ts != AV_NOPTS_VALUE) { AVRational tb = avf->streams[pkt->stream_index]->time_base; time_since_recovery = av_rescale_q(pkt->pts - ctx->last_recovery_ts, tb, AV_TIME_BASE_Q);