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 0F5914321F for ; Wed, 25 May 2022 08:29:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 807C668B50E; Wed, 25 May 2022 11:29:14 +0300 (EEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D14968B0AA for ; Wed, 25 May 2022 11:29:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653467352; x=1685003352; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=H9ngx2IbdWXjWF9vH4+UaE5z9UdWBXPt6bZtHqHd3Rw=; b=ZlIx3KfrRFvi/aiYL0pzFMhYfbvMMcevZ1t2wLh2vL6EWSMyfJde25Lz Q2J56euphq4nWpWMrDnYi4jNMuV98Xgx3WcavdIln83CjLCY1ctLe5r+O umqoGBUw8TWZzw1YN1lJ0zrVmsj5Ipa4/ekYLGjAE0WIU0a9TOtGChnzR QRGG72IkJ2o5uouXn++oFbeHeCNVXDOm+LRGFWhr7vWV0DALYcTds7mxD nqGZ3BogfF8eo/lU/tZPYK1HBlgk7kmmyVuh5XMy+WxEpE2X8tarLlT71 i7pj3PtGf2rDZyYBoTb/j2i1CotcXcBlxOKyS6N3zXU4eP8UY+bEKVVfK A==; X-IronPort-AV: E=McAfee;i="6400,9594,10357"; a="299086929" X-IronPort-AV: E=Sophos;i="5.91,250,1647327600"; d="scan'208";a="299086929" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2022 01:29:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,250,1647327600"; d="scan'208";a="676775413" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga002.fm.intel.com with ESMTP; 25 May 2022 01:29:05 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Wed, 25 May 2022 01:29:05 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Wed, 25 May 2022 01:29:04 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Wed, 25 May 2022 01:29:04 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.107) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Wed, 25 May 2022 01:29:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=etEtPmqTL5WMCdVlKzd8RSfGdChGOEHYiFIDyuaKbBcnjHvh7GKUlc52aAoa6nu1HloE8UF6lJtA5UOCjKcZysCykmDCn83Yken4H/hg7cZhPPKYkbjrn90DDyq0jRbVDvHcXw7efu/4cW+V/AtV3X5oFnNxNcYrGf0h+cAAeqSscBjbOeVY3D1VRBrv+7Aq04uu5IXF5iF5ufgwP6rde8uWOJdt+0OnhqRnOGkFBgK9z7FJUqCoz9DaNIUHnPubaDMy3aJRuZHisMWfxdCUK39TONqUdpGlu7hysxneD8VB5k0p0MqwnjmQ5cPwyLYkGOiA/wCg8bcp20xctigMyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H9ngx2IbdWXjWF9vH4+UaE5z9UdWBXPt6bZtHqHd3Rw=; b=XXMP+lKlwjhAodNcpXPrYYRXBCigaIol1ICT/JWxe+eAgve/1iwTc/yCnN35q2ITFMTUSHdPCnsyZTeJSSLzL/VC2UCLuURmmLGmEBogK3QXfOJUceRmgrWb8qnHqdHzGP+gXS7/l1ERcBaQovcPnH39tOEuQEdd1m5DA7rC8hh8OeQoC7RYoc4ziSWINHHw4Rg1PAxVExHMY6iJRYcSze/UjbIzLTfRUyTrcRyTQQ/PReHqz5i1yz9i44DDGrcw9I01ldxbGlixLW0P28Y5tIdwp2c3trzNN6qkBqJmBKVww/xH96bKS5BV+PPbCwvgpKY6P9d6RkvT7JFGGI+gyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by DM4PR11MB6429.namprd11.prod.outlook.com (2603:10b6:8:b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 25 May 2022 08:28:58 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::2d06:ec38:937a:da73]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::2d06:ec38:937a:da73%8]) with mapi id 15.20.5273.023; Wed, 25 May 2022 08:28:58 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v1] avfilter/vf_vpp_qsv: set outlink to EOF correctly Thread-Index: AQHYZZ9c7rvPujH9O0Cz46jMr5ucvq0vV36A Date: Wed, 25 May 2022 08:28:58 +0000 Message-ID: <1b97cb8164c701132676110fce96cae24710d4c5.camel@intel.com> References: <20220512011821.2342620-1-fei.w.wang@intel.com> In-Reply-To: <20220512011821.2342620-1-fei.w.wang@intel.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 66f6d335-61b6-45ad-fc7e-08da3e289d52 x-ms-traffictypediagnostic: DM4PR11MB6429:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: avrS9qEpqtOoSXK7+8DUkg4zX6/BmSLGfng5Sf1VTS2yB9Xtwnxv4Vb6XC4PO2jPYQ8XVdJIu/F8XF1tZV9lDfcynhYKzB4nMDs4/JwrDeqq8S6FhuPGnVtlYFLnKgSGJBUA7kyejYHeK5D9nVzHv0DbfSnNqPRG7nGBXvt6jxc4hOUo7aeTy3enZja/cjenWpdDc655M3rij98eb0u9xOSru3OQeg1xBV6zOYrpwtpKUQgd5kHKW+K3EyWBqlyIAebsaY3LGajus9kYMj4utXKIfCX/0KT/tGi67GOv/Vx6aIzb4GfVvFwHNZDaAQRwCmOgJC4CzeAgkUJGSPIqekUHR86Zx6cOPx2Jq+FNdhtFBVZFjU4/UGDc0Rq/rVduTZSphrBXX5jR/KYjCVlXwUjzNhu5IFGh2dCOqf/w6IYF/4xMLMCUkSH0ESGZxzDvQyzuzzwTaXbPuHYS0Pz/mkXn0LvIBLCVOPvygAM3/5G916hx920lOOjZY2gfqSF9QfIUGl6BXnJV9kzZwxX7GNCJF7ud/yrwWhYHp7GwrWc9usnFgqfw4BjLLBg2yTuusVYlaWO7rfyVJpBHisDGYo1z9Byv34Pv/Y29qS7nHBwpwaK9tLjVqU1TPsNglyJ9sRTn8Zc6Lj0riTm8mePuXHlgwXMRJQxjv3jPjfqal9jSn9AJ41dbo6EsYGqMC4gZYKYbAX7kjiU6B9VwRPYKlV2IfuXgTmrhbPN3yj/6yLA= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6512007)(71200400001)(316002)(26005)(86362001)(5660300002)(6486002)(508600001)(6916009)(83380400001)(8936002)(38100700002)(66476007)(4326008)(186003)(76116006)(82960400001)(8676002)(2616005)(66946007)(2906002)(36756003)(122000001)(91956017)(66556008)(38070700005)(64756008)(107886003)(66446008)(6506007)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?REFjQWpkREIxUkJEdk9OYXlZcHl5OVZYUVZJR0VCemVCNlUyTGRQaHhBblZI?= =?utf-8?B?bDgrazhON1ZIWVVCY1VVWEVNSmpPSVJDN1gzMUtMUmVEWElTdjVFSWxZM2gy?= =?utf-8?B?WXJMNHdpMnlJUk5CVHF1ckxoRFA5QmQ2bWduU0VEdDNqV2hueDh4V3gzdm9z?= =?utf-8?B?c2ptam85VnBOVVJCQXBRKy9taVdnbTgyNnZJNGNleFcwRDVJZUdYS3JRUUFE?= =?utf-8?B?VkhrN2pNYklGNjJBdnFRSnhVcTh6K3c2Vzdya3pmdFhRdVFxbC8zOGpkN0xp?= =?utf-8?B?WWlvb0NiSTZlQnVIeUNpQWh5UXZLV3hMOEEwM2p3WXJ4SWtha2szMjZMalFV?= =?utf-8?B?b05INzhWMGxmb0dRSEQ0dEZEeDZVeWFVUnJGTnNoRjkwZmtMaWR3ZjBFV054?= =?utf-8?B?VEpENG5hY0djRW1CRVFGOE9DMjBLVTVHa1A3Uy9IVnBQTDJkamNsSk8yRzBy?= =?utf-8?B?ZUo4YkVMRkV5dHVPMDlwVjZEemQyYlVnZVBwZjQwQy9udjE1a095elZWVlp3?= =?utf-8?B?Uk9ZWXU5YXRoczlWRkdYYXRmMUc3cXMxN2dKRjJ4N1ZsL0Y1dXJKOGs0VUU2?= =?utf-8?B?RnJDUHFzQlNxRkdURlg5TzV5QnNRY0dxUGsrTFdoaDRmRzMydmpSY2VDTWFL?= =?utf-8?B?VEdIYkxqOUhUeUt0UEhKZWdFR3ZTS1R4c3ZuNVdEUFpSMWlkQmxTbHo5Yi8w?= =?utf-8?B?QU8vSTNLTmQ2TzRSYjVOb2xraW1IbFN5RkdoMWpMMFBsNVJhK2JaaHd2TmNC?= =?utf-8?B?bDI5c2Vac2tZeUVNc1E2ZFpPSUpKeDBRRGYyOEhrT2RDalVQK21MMTl0Kzh6?= =?utf-8?B?VzlTb3dab1d1MGJzVVR6UmMyc05xSStFdUthQmFaa1RwMTgxcnlQaFJvMXJZ?= =?utf-8?B?U2RTYUdYSllEWmpxRzNXdWhsTlh6TlRtVFEvOUliazFKdnhyQ2F0MVY0Q1Ny?= =?utf-8?B?UG9EWmxHQS9VNG84Y2ZWdEdQcDFIQ25XNUUrOTBpako1N1BZeFY3ZkVySnJO?= =?utf-8?B?R29yRyt3UE85U0FEbmFiaDhlQURmK2RZcUxROEs4VjFEQnBDKzFtZS91czlK?= =?utf-8?B?aHViK2tzWHl3blMwZDZBTmRMOUpPNWc1c3hSbVBvUW53cXpkc3dNS0hUNTN0?= =?utf-8?B?VjA1bzV4Zi91aVdkRGFhV2poZXRpTXhINUhzdDhSZWhTSkdnakVKMllVRU5Q?= =?utf-8?B?bE1uc1R3eWtSL3dIVVd2SXltTkZiL2lRUVZaSkROV3lFWk00RWVuU0JVQTV0?= =?utf-8?B?NnU3TjE0eUxuamtJWnk0bFR6cFVma0w1cTZOWjVlemxrSk9Wa2hiNVVINlZT?= =?utf-8?B?cFh3SDRrQzdvS3pTTU5GUnRTcFMxWGoybThlZ0dHM0RCOHlYTWVLeVRCdmYz?= =?utf-8?B?ZFlOREhLMU5tTTdDUHMyd2VTVUR4Zlh6cW9LNDRBLzVlczlpZFBjM3MxWkw0?= =?utf-8?B?R2tQN0w0aDVpOG52dmdZNlhld2VHRklwb3NnWC9ZTGt1ckpSTTRCK0UwbE9B?= =?utf-8?B?THRMOWt1N01OeWtuRXRwYm1neDN5OXJ3Z2h2V3BBdzJrb092aEFLYk0wekt5?= =?utf-8?B?TVNWaEl4NHJHZjIvUzgrdWM0L0VkV2pVV3FIT1Q3RlhHNi9mRXlKdmlZVElX?= =?utf-8?B?aFVHbFdYUEtiTUNmcnVNeDNRVGdQeEFZekhwbkRJTUtxKzB0QTJSL3NsaXho?= =?utf-8?B?L1JHWHJYUXNiRzlDbVB1dlJsc3NQc25iTFVDdUpUNmZUWFlueG1neEwrZjVF?= =?utf-8?B?MTJCTG54WDFYQ2NEeUJaNHVVMlJlbmZGVzZqK0Rxblp5OE9xeVRueUJlZWt1?= =?utf-8?B?cWt6Szd1RklQQkxFaUJVMlZaUkxSMzB6dkJUOGdUOTZaYTNaZ2ZVaFZTZmtJ?= =?utf-8?B?OHF6d20yYkE3V1VUQ09XOUVWRUVnSU0rN24ydHBLN1ZoRkJxbGVxWDY1WTdT?= =?utf-8?B?WTBFbmVCbGdHY0tUcXlhM3dqS09IdzlzRXBHV0VicnBOZ01QaWlMM1lMUCs3?= =?utf-8?B?VlA3eW5EOE53UU8xZUdYRWh1TllCTzVLZ0tBZ3hsWE1aQlpWZHQ0ZzNsWHNn?= =?utf-8?B?WWVxTi9IRVBHME42aWF1elMzaDJmei83eW0rZUpRb2Z6T1FMOWt0RE12clJZ?= =?utf-8?B?TEk2VHIzQjdaRnF5blVyUVIxVU1OSG9raHN6NHFZeE9LalA3ZzJWei96MHha?= =?utf-8?B?aHlncTFvKzVUUkpyeVgzK2Z6OWh5dmludHZ5SzljU213a1Q4SFRVTVlmaHA3?= =?utf-8?B?bHExZTYxOEZWclIwQ09QOFVMS1dtd0lXeDBwaUNLb2RCMUJHcHVIZVNWREpI?= =?utf-8?B?TStFYVRvemx2Wk5qRDlpRUJpMW5rbEJxdSt3ZUw3WVlvTXpmaEEvZlNoSDE5?= =?utf-8?Q?+oNjHNMI3PuA/cd8=3D?= Content-ID: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66f6d335-61b6-45ad-fc7e-08da3e289d52 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 May 2022 08:28:58.5265 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: X54ukT+PmVmVDx5/Y57spoIGIxKvfH/JqfXSj3GOzXMfMu9omKrR0JmSNM1sWhJg7cAEwwfZiU33SiLeLFfY1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6429 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v1] avfilter/vf_vpp_qsv: set outlink to EOF correctly 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: "Wang, Fei W" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 2022-05-12 at 09:18 +0800, Fei Wang wrote: > 1. Return error if filter frame fail before set outlink to EOF in none > pass through mode. > 2. Set outlink to EOF before return success in pass through mode. > > Fix endless cmd: > > ffmpeg -hwaccel qsv -qsv_device /dev/dri/renderD128 > -hwaccel_output_format \ > qsv -v debug -c:v hevc_qsv -i > 4k.h265 \ > -filter_complex "vpp_qsv=w=3840:h=2160:async_depth=4[o1];[o1]split=2[s1][s2]; > [s2]vpp_qsv=w=1920:h=1080:async_depth=4[o2];[o2]split=2[s3][s4]; > [s4]vpp_qsv=w=1920:h=1080:async_depth=4[o3]" \ > -map [s1] -c:v hevc_qsv -async 3 -async_depth 3 -b:v 9000k -preset 7 -g 33 -y > -f null - \ > -map [s3] -c:v hevc_qsv -async 3 -async_depth 3 -b:v 4000k -preset 7 -g 33 -y > -f null - \ > -map [o3] -c:v hevc_qsv -async 3 -async_depth 3 -b:v 3100k -preset 7 -g 33 -y > -f null - > --- > libavfilter/vf_vpp_qsv.c | 35 +++++++++++++++++++++++------------ > 1 file changed, 23 insertions(+), 12 deletions(-) > > diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c > index cfe343822b..3d9d3afbc8 100644 > --- a/libavfilter/vf_vpp_qsv.c > +++ b/libavfilter/vf_vpp_qsv.c > @@ -556,15 +556,17 @@ static int activate(AVFilterContext *ctx) > qsv->eof = s->eof; > ret = ff_qsvvpp_filter_frame(qsv, inlink, in); > av_frame_free(&in); > + if (ret == AVERROR(EAGAIN)) > + goto not_ready; > + else if (ret < 0) > + return ret; > > - if (s->eof) { > - ff_outlink_set_status(outlink, status, pts); > - return 0; > - } > + if (s->eof) > + goto eof; > > if (qsv->got_frame) { > qsv->got_frame = 0; > - return ret; > + return 0; > } > } > } else { > @@ -573,18 +575,27 @@ static int activate(AVFilterContext *ctx) > in->pts = av_rescale_q(in->pts, inlink->time_base, outlink- > >time_base); > > ret = ff_filter_frame(outlink, in); > - return ret; > + if (ret < 0) > + return ret; > + > + if (s->eof) > + goto eof; > + > + return 0; > } > } > > - if (s->eof) { > - ff_outlink_set_status(outlink, status, pts); > - return 0; > - } else { > - FF_FILTER_FORWARD_WANTED(outlink, inlink); > - } > +not_ready: > + if (s->eof) > + goto eof; > + > + FF_FILTER_FORWARD_WANTED(outlink, inlink); > > return FFERROR_NOT_READY; > + > +eof: > + ff_outlink_set_status(outlink, status, pts); > + return 0; > } > > static int query_formats(AVFilterContext *ctx) LGTM, will apply -Haihao _______________________________________________ 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".