From patchwork Thu Jun 15 15:17:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 42113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp865079pzb; Thu, 15 Jun 2023 08:18:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ74hXBPTYvzXeqjt/66dByvs9v6mf9x+JJ29G5UETWtIRovGo1iNfskbJNIuP7klNT603Fb X-Received: by 2002:a17:906:c156:b0:978:a186:464f with SMTP id dp22-20020a170906c15600b00978a186464fmr21469974ejc.39.1686842294450; Thu, 15 Jun 2023 08:18:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686842294; cv=none; d=google.com; s=arc-20160816; b=QAkW2tcGxouXK6XWc9LXFnWRTkft0BRjdcZ2puOdjjnw0NJaQK1mm1M9ph5A+lTnFL 7z6ONBYCE5RGrO9Gc9hiie2Ah+aO5xUS21T9CLkgRFpHipAb+6+VZAU495015sT6zyng fK4JY5zFIBy3lNCPZ+rO4LC6iAyeCWoeFlUVfQzg0NYu+s3FnBwlXNucUrNVCHpptbXJ RJYC6zm0B1dm/L+9UARPwqoObVWpDZPb3UcC03KquKBLS/hZdHwPovvEjmFbFk65Qk5h +hnoGbTW+h+s5ojd258akUUJRKnerOcwAXQxcwL/hUYWsZBpQ8mIQwvUfcJ/103BUNBK xY3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=zdGp/cWYSQbKYwKiB9MDRghwTfCBIazIRXj623IsIZE=; b=dgfjzjBwzT7nV4HrV4vyAY/igHsaFz7QJazM/vnf4wO854ZYyrogO1Mz+NsFjo75j5 TpLvdmAmALuFD4GLvtVRO2+aT/cu5pXCZi0E3xaJAwdEMic2/rTsKOB7WA3+GXDYph9w WypEKqmOU8HJlXpJbLYFcptdd+3m3zb2V4qQDF+zTD2UXNqeHAzP00UC4AHeuotBWgFM WM4JtCyMO51N9eHrszyJOGSpc/EqzhlbXXcFdoDM3oLrK37OGKVSDnkIKh/vkyEoWUNF VmQ8GRWG3qvZG/L/HTKWGUKJih/SliZbNLNsog5Tu5adtmLcFxwWI1qn61HYkRfFhaU3 TStw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=sgRpj4s1; 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 xo22-20020a170907bb9600b00976c99cc23csi9237859ejc.381.2023.06.15.08.18.13; Thu, 15 Jun 2023 08:18:14 -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=20221208 header.b=sgRpj4s1; 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 B1E1C68C4AC; Thu, 15 Jun 2023 18:18:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f45.google.com (mail-ua1-f45.google.com [209.85.222.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B17768C312 for ; Thu, 15 Jun 2023 18:18:04 +0300 (EEST) Received: by mail-ua1-f45.google.com with SMTP id a1e0cc1a2514c-78775a5a84eso1512145241.0 for ; Thu, 15 Jun 2023 08:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686842283; x=1689434283; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=PTrBvMmzdOEIg+hOJ9Diz1c+S8RFPlgj7nXOp+bcZkY=; b=sgRpj4s1OIfvqJ7UD9GeSs5y/JcJCTEsdqqmJd9XpT+N1b+QcXoadpJIf4ipKRzp4h EpWlZ9Fdl7QZt7+5TH0iy90WIQ5Mkx8N6ag8mTNMfnywe2dTZ61FtXhFCUzk/CP7sYGd GglWBgKMSve1j7+opBldkh6qj7oFK2KW5UjdVR26Ayly6RPWQNss1HxYwJQf0pdvNZur fRW75FDEx2EaILZYXwYPqNXO6ZeagVqesfYlQ1xd4hDyLI3Yay4yoHxGYKCPXlTNTtfl A0/VviZ0cE9ljcNBDAAj5XQl9K825MU+Xiojc1OcvSDA3upCZytwYtPpp7DF/20ffmwn MiSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686842283; x=1689434283; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PTrBvMmzdOEIg+hOJ9Diz1c+S8RFPlgj7nXOp+bcZkY=; b=F5RCrfwJPsSWd1+64oOGrfBeLCmuMzHvco6pTwM4kwVw7YNfBZcPD742702tamgxqS Q0QZCMYg03LE6FLOGcnYWFdFYB5bqKj9cG7DCxuc3bPrAqaesognYm6XBtSNN66yE5nA ROKM3SMGyY3/OPUtiqK00x1kKt75UGE50onnqbkrDu+EJzGrStBVUbqAg8Mt54m2LrLV jbUEOb89A8wupNbVV+Xs8Db78bh/MMFnxuq930v33bFDw4fJ4oU8wztGUz/Tl0T++ZU+ 3ykAdrGc1l8MP81Z2TjJdfLV7zglv1VT8vAEatZUc4vF0tsuZHWWiLMwtEVT9sjvVNHt goCw== X-Gm-Message-State: AC+VfDxj7BCxU+gy236s20CJFpWnYu6pS3qvz0EmSXUqA5zGcz4BS5GH lFLHPe5HmXwR5BC+a2wVQjuvyaew9ZCy6EKVXf9VU+xi X-Received: by 2002:a1f:3f83:0:b0:471:1589:d2a6 with SMTP id m125-20020a1f3f83000000b004711589d2a6mr1389729vka.12.1686842282758; Thu, 15 Jun 2023 08:18:02 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Thu, 15 Jun 2023 17:17:41 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avfilter/buffersrc: stop passing AV_NOPTS_VALUE on EOF 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: A8S5luUjCqem Attached. From 88fbb2fbfd2bb7cb3474d54cb197ee42b1404532 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 15 Jun 2023 17:15:44 +0200 Subject: [PATCH] avfilter/buffersrc: stop passing AV_NOPTS_VALUE on EOF Signed-off-by: Paul B Mahol --- libavfilter/buffersrc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 612541b803..ea50713701 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -61,6 +61,7 @@ typedef struct BufferSourceContext { AVChannelLayout ch_layout; int eof; + int64_t last_pts; } BufferSourceContext; #define CHECK_VIDEO_PARAM_CHANGE(s, c, width, height, format, pts)\ @@ -191,10 +192,12 @@ FF_ENABLE_DEPRECATION_WARNINGS s->nb_failed_requests = 0; if (!frame) - return av_buffersrc_close(ctx, AV_NOPTS_VALUE, flags); + return av_buffersrc_close(ctx, s->last_pts, flags); if (s->eof) return AVERROR(EINVAL); + s->last_pts = frame->pts + frame->duration; + refcounted = !!frame->buf[0]; if (!(flags & AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT)) { -- 2.39.1