From patchwork Tue Feb 20 16:33:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 46396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1965615pzb; Tue, 20 Feb 2024 08:33:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUJgI7mjk4H6tfA+J3MMxrdYtaQDUTUX+dSuCU9WMu5QHwQf9195oe/YBWuXRdVsgKgf7yvBkAEJc0vQwAQmVYza3T7g+dkaIjXvw== X-Google-Smtp-Source: AGHT+IGoC0KjG0FgUJyDRuWaOo8zXcCMtbjzFzMTqXnOLRB+Jmx+erRQYyTKJDXQkn8zw40lMj0B X-Received: by 2002:ac2:5f71:0:b0:512:a3d7:58dd with SMTP id c17-20020ac25f71000000b00512a3d758ddmr5846297lfc.30.1708446810379; Tue, 20 Feb 2024 08:33:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708446810; cv=none; d=google.com; s=arc-20160816; b=goWxWUueuDSppxTdYUOzSmEKs0zqUyqD+1mE3iZniPgmGXaBrZl9zRIuTpzyllztxO r+tIUnVj/sllc4WhGryLhw2M+GdVcvmERV2OSF3fy/aJu2ZsfER69S6iOOIoLlntPdAH yguRaSx90eesxT/QFobPqCt9bhcd/NrN0wAQW87oXxgeI8hh6vEfSxhi0jn6Tyc2MLrf j/dfmRcySS2Mp23vBzNxTJivZt0XaosOjGwAoXqoW3VY1+Viif5fkuD+1USV5YBz/Vb9 1CZs2132dZES5HhO7Geq9XsSSwpwRporrRIfsp36EAas+LkqiCJNcFTA6jW06RhUP163 xZgw== 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:delivered-to; bh=i2yaCgCseXNKkJHr/+JjI22WO1e12bj6DZb0tGdxp2Q=; fh=zgMS+X4RExv2k7fU8QdWClnqVJdqO/9UbUuBS5xxJDs=; b=vu+wfoJ/a3b0LUshUeUAeRD9kIAR8vNtHv9fmp1pKv7AoXnXb8Chozao2IL+uXwjnN pDlBDC1RO2vxl5te4DvA5ZVYOAyB2dhCbm0Pa+OyevtR2fzMHXEupH0kV1j/48MoMtHF +NBpiv+eftI1Fwi9lJE6ngimJErR45YKhVkD8GVvNyqC3eiTxH9otGorfxCtOFAUa+Xn Bd80NVq3bFk2EG3lqoiIMhlMXwDv/v5e0KdH1Do2dZio0CKEbBxAHOqrlLQqS/kO7VnL WAUY/ibgeKPb15iWR8AjBF7+5EphS6MFp8rRAEmvuZ8jDOhbk4p9Frs2AKio407v8PVq RaRw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 he38-20020a1709073da600b00a3e8c1df5fdsi2339863ejc.43.2024.02.20.08.33.15; Tue, 20 Feb 2024 08:33:30 -0800 (PST) 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; 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 5F59768D23E; Tue, 20 Feb 2024 18:33:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-1.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A13C68D217 for ; Tue, 20 Feb 2024 18:33:06 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-1.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id 90F8D2078A; Tue, 20 Feb 2024 16:33:05 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Feb 2024 17:33:01 +0100 Message-Id: <20240220163302.1943993-2-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240220163302.1943993-1-nicolas.gaullier@cji.paris> References: <20240220163302.1943993-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/parser: fix fetch_timestamp in a scenario with unaligned packets 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: Nicolas Gaullier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zfrEtPzeztIC Fix fetch_timestamp when the frame start is in a previous packet. Signed-off-by: Nicolas Gaullier --- libavcodec/parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index efc28b8918..853b5323b0 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -153,11 +153,11 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx, } if (s->fetch_timestamp) { - s->fetch_timestamp = 0; s->last_pts = s->pts; s->last_dts = s->dts; s->last_pos = s->pos; - ff_fetch_timestamp(s, 0, 0, 0); + ff_fetch_timestamp(s, FFMIN(s->fetch_timestamp, 0), 0, 0); + s->fetch_timestamp = 0; } /* WARNING: the returned index can be negative */ index = s->parser->parser_parse(s, avctx, (const uint8_t **) poutbuf, @@ -179,7 +179,7 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx, /* offset of the next frame */ s->next_frame_offset = s->cur_offset + index; - s->fetch_timestamp = 1; + s->fetch_timestamp = index >= 0 ? 1 : index; } else { /* Don't return a pointer to dummy_buf. */ *poutbuf = NULL;