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 BFB74427B4 for ; Fri, 7 Jan 2022 07:56:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DD3A689991; Fri, 7 Jan 2022 09:56:15 +0200 (EET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F47968092F for ; Fri, 7 Jan 2022 09:56:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641542172; x=1673078172; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=CnPX3SJrdgqQz24B1qrl9zVZWnzkn7EMHUl+fO09cFg=; b=NKbGfaCCV06KpKn2TsCizy+RZsWaZRQZLij5kjxf609OnvdgMY2T9L4K pk1KbQUeTv/haXXT/n29A8fccRGUNHUv8fO+pCWtEBdeZnizqau7YsFXy ZyKBavWeVw3SaZ3P2DLyZyyCscc2sJ1OIY0SWzWjkveWb8YSQXQKJ3Klb xDBY5uUMNRg4b81WlDL7vXaeeIOR97+oedQtA95QO49F1vNLDU+KKZuPe oTxAroRUfr6svoDOtMIZhYOyVp7FG+qVO+ZDXe2CNNa91PdKG5xHXQXwc wLHvNqxrVetrWlfgfNAi1V4ZYWzT0IPPxKCsfvUI7//SXEwYkO1tPnDFG A==; X-IronPort-AV: E=McAfee;i="6200,9189,10219"; a="242621411" X-IronPort-AV: E=Sophos;i="5.88,269,1635231600"; d="scan'208";a="242621411" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2022 23:56:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,269,1635231600"; d="scan'208";a="473235631" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by orsmga006.jf.intel.com with ESMTP; 06 Jan 2022 23:56:05 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 6 Jan 2022 23:56:05 -0800 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.20 via Frontend Transport; Thu, 6 Jan 2022 23:56:05 -0800 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.40) 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.20; Thu, 6 Jan 2022 23:56:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O43pSGhibiiLBwRfxaZDotbC7//mCgQ5Sg3hUwxWdBiXDa8A9bZM16z9sXi85OO15LD8bkvRK5fIAVlacsxp/D8vs2m9Ckhn3+9gcB1+RC+AgHs+n5e0ww+JvGiYcYI1Ep+gl5qSuwZa6nqxQQ9G4IWtyP+U0TwBpIuqqrHEuFSLiL6OI37JvF4kvuA2XoipjmM0e/tZBSgndPdaR/Ip8ysGb7U2kYTziBva2YkrU0O1e9uG/rAGl8jo7Zc54pkVhSMuR0lsIqKIfMCoy/BbdeLWASBaajTBm9lZoVIMT3y8hFMZyIClYMNW7xOcYEOl5XxCYJpylWvrNsmHhKAUVg== 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=CnPX3SJrdgqQz24B1qrl9zVZWnzkn7EMHUl+fO09cFg=; b=O9AYyzwxzxHYbBTWTwW3uSgufCZKHT43ri4fcBAuQRB0GdhFWFv6k07vp8mI1OJRQMGuJq9reaydy77S+mRrRi7+BC+3skdbTFXbjA3gPTZyU4LWmLPrsF3wL+rCuuP6xFLLav4Y97pq/sWB4Vrm6trMVLKigb9+f5yhRQNo+IL0y8R2u+0ANWEPXjIJaqNCWgawguwPkQmVYeRtBRZMKL8Q0ZmO0TkdQiQXy5winG7qFk4tseVB/e//1MJIM/ur2CkeirWWvE+mafNgxSrNgOu9r1HPDtqPK0uj+1HqUzhQFzvWGE6mEFWLB/P61U9vHT3JNFq0+nFfPggPUaX+OQ== 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 CH0PR11MB5507.namprd11.prod.outlook.com (2603:10b6:610:d6::8) by CH2PR11MB4247.namprd11.prod.outlook.com (2603:10b6:610:42::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Fri, 7 Jan 2022 07:55:54 +0000 Received: from CH0PR11MB5507.namprd11.prod.outlook.com ([fe80::3452:f571:cd43:8ff4]) by CH0PR11MB5507.namprd11.prod.outlook.com ([fe80::3452:f571:cd43:8ff4%8]) with mapi id 15.20.4867.011; Fri, 7 Jan 2022 07:55:54 +0000 From: "Xiang, Haihao" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for ff_qsv_map_pixfmt Thread-Index: AQHV64Au4o+MfUnn7EOuXgR0+S0Pr6xbXx0A Date: Fri, 7 Jan 2022 07:55:54 +0000 Message-ID: References: <1582596153-1442-1-git-send-email-linjie.fu@intel.com> In-Reply-To: <1582596153-1442-1-git-send-email-linjie.fu@intel.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.200.16 dlp-reaction: no-action dlp-product: dlpe-windows 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: 2f35d25a-af45-48b1-e42e-08d9d1b321ea x-ms-traffictypediagnostic: CH2PR11MB4247:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ge/+NDMeQG0XFe8o0NazflPERzBZBkcF4J7AoSq+stuJ7JNa7Vfl9vznw046l1zp2AlqDIyKYaawTLIvroRo6u7YZY4FmF5KEnNViOEJ8dqiwJLYgz+05ZRvwYNef0iUvgC5MfXaFvMTNYS8VEubgTQCM2J75xabu9kzpwGFh3AGb/OPzGGRJNjzR5wSeWseV94ht1MsgQhcKu7dy+IhUP43x9LUFdq43hT9Hn4VT/GWiDmYvgX6fGfil37IyMBeioGIaVKCB/njFgM7ImG4tAeiGBSzTJeZUO5DLb4JnBG8+Cmd2a8cha6HFBK6GPMyfjfVj2vYailEP+dAtvT0cX+4/Drc3soSUSN+qzqZhnxaPPQAkmRlfkhWImEjA3qwFZJ5C9LKEYOvdhpbsRLU1osuH34dMMYpI6HRY/peDwIPaPvUW0xXmbhCVMQhdm4vwl0qhcqb07sG9QRHH1US9yRakXIaoU6Q/KTOPjy/Zf0l1hCfXb9NfLdhke3iR0BvGf5f1TMb/CEtuZr3fewVZX/NDTsJwv0Gk7e7WUNdCrbj2ONxcyu72CPwNHz/PhvNKFxEqHG0eWFjejSvDI5iSFubuAcHnaJhReI88tuLGiqHg3OOmpkMVq2wMSIjBsca5mxyYKCwvrKiYDuv/Q2M+RBiM6mkLG4Xz6Ou+0Bxi3LYO693zCA5XUpXW4z2wsR9RJkjvb0Vho1QvK6HAl8y0w== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH0PR11MB5507.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(64756008)(86362001)(4326008)(38070700005)(66556008)(38100700002)(66476007)(66446008)(26005)(83380400001)(122000001)(186003)(2906002)(316002)(5660300002)(53546011)(8936002)(82960400001)(66946007)(71200400001)(6506007)(6916009)(33656002)(76116006)(9686003)(55016003)(508600001)(7696005)(52536014)(107886003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?K2UvZk82ckdNZG0wODVIWHdVSlVhNHdoa2hkdjY3N2xudzNmMlYzd05KSUNk?= =?utf-8?B?cEhLL0V6V3NtRTFpMWVlUTB3VDA4RzlJek5xaHVRWU1BYUsyVXlpVVJra2xx?= =?utf-8?B?SmtWamFUbWxXNFNIV0dGdUFvaHJTcEhXbTNyWThCUUpOOFlHVHpoZ1hPaDVw?= =?utf-8?B?THVqSzFFYkNhQVk3cXdaOVFkSmN4Wmx2ZGY0eCtISy8zVnk1MmJPaDFxWmxO?= =?utf-8?B?NzJlNFhjV24yNFRCV1ZwVGRBTDJreGtFSGtjcUthSW5xVHByQ0lkYTExTkZr?= =?utf-8?B?VkxnT25WVGdxSkdTMlZiVW5yazlrRW5sYmo4V2UzbXVhZkpCR09EenNzdm9W?= =?utf-8?B?N3hWajRYOTdBMjZPcGhtNDgwbitSa1NtUUNNdGgzejJFVzg5T2xZUm9SQWxr?= =?utf-8?B?UVZjU2xtcWVwSTlDampyWmFzdUY5eXNuN05WYlR5RWxKdU1XYWtSYkNoWit4?= =?utf-8?B?VTFWV3RwZmJVRTZrV3k4cFRnL25hU0FVOUdITTcwTkY5QjhPNW5JTXJDN0tw?= =?utf-8?B?K3pBVDhTN21GcEhOZno3elBNdlcvYWdGZDNmcUxjNmFyWXVvbkU5U0F1UGY1?= =?utf-8?B?aXVkblF3ODcxQmJkbDZWdjBzZ2pQa0xhM3BQbVVXRnBjNkZSM1FvbkxveHFQ?= =?utf-8?B?eTlpa2FUbXBMMmFFTlZab1FrY3NiUlFvMTdOd2hxTlU2TitlT2FEeHpRU0pY?= =?utf-8?B?cXNsa3ZvQ25MWTNhdHNObTBubFZXV3pNbGtWSVZ6N2I4ZkhuZm04NGRtYk5Y?= =?utf-8?B?K2xlTUZqRmZkU25FR2xFMzFEQkx6SmsyaXZuRjFKaEsyMXpGMUp6Vi9aUVFL?= =?utf-8?B?VWdXM291RDBtbEt3NVBmZGx6bCsvdFRLNE9PbitqWXBybGZCTXNmTDROcUFr?= =?utf-8?B?REw2K1V2em5rdkcxZjJsbzN6eWFaWG00MFBBZ3pvaitsYVZuYzIrYUhKYW1V?= =?utf-8?B?dklVVWE1dGdxM3RHUnNQalZoaG0rQ0J6eVZLS2kwZkE2WkxPU3dXc0FNTTUy?= =?utf-8?B?UW5YYlBoenRXQjg2VXNkOFhmMXdZb3NKN1pmMStvaWZaa1VLbEE5bWJPMWdE?= =?utf-8?B?MEFwcGQzMW9XSnljWXgvcmVYVVl3bHBydW9kdWUvWFIrUk41T1lsbFJSOEZQ?= =?utf-8?B?VFVUYWk3UEZaekVFUTQwWnI4MCtnMVFCWHhnbnlqRzZ2UTFVSWlDVkQ1K05E?= =?utf-8?B?Q244bk52RE0wTnlXcjlabHE1Q2ltTkZZekRWRlJlc2o0YUpQaENkR29wcWNV?= =?utf-8?B?WDZLbHZkVng4Tk9wN0JNSzgzSUU1TEFEcE5SckdqbHhiQzdWM2U3Yi90K0h0?= =?utf-8?B?VWNHb01IWEFETngzdTR4MytvS0x5dGgwT3h3TW9zdzZacHRXenBBeWNQWmJ3?= =?utf-8?B?Wm9iQWdHMzFoZWtnVWoxSlFERTNYRC9uK1hZYzZTbmlLbWZ1TDV0UDJXRlVw?= =?utf-8?B?ZnFnTTFTMFRKUTBscGxQZFlKNm4rQ1VJNWdzTE5YK0lETDhRTmcwSUlKcmxr?= =?utf-8?B?T1JJbldRREFHcytpQ2o4RXhmL0h4MWZnZFRQTHA1UkRHczN4bnRXSjhpNVps?= =?utf-8?B?N0QrZFJTZ2FoMmVXemI0Q2JTWktIbVU2ZWU3b093UzZWSjJiRll3ODdKVHB0?= =?utf-8?B?UlNlUzZ4YkFZeEtrdm96UVBMMWhMNnlaNU43ZGFGUUNLd0tpaWJRNTROdXRv?= =?utf-8?B?emdBK2dyZS9XU0Z6cWVoVXczZ3U2Z0hZb21pMTdpVXZxcysrU1pKbk9hZ0s0?= =?utf-8?B?a1FXZEhDK0tYZTFsdlcycC9nT3lmZDcrN1ppQ2lnZzZ1eTA1STRxNU1ZaEh5?= =?utf-8?B?N1RrUzlUZUViRTFTN0loNk10NGwrM09JV2lTU0toK2RoYTN6NUZocmh6YU83?= =?utf-8?B?WldaekNGZFJTbkNGdlR1eGpuc2FYWmkxYW1WNEc3cFUvYnRvRVB3TFBOSDFm?= =?utf-8?B?OTU4T2dEZWR2M1N0dmZHVEVMcTJCNjlZSmpKa0lIRXFWMUh5N0paTlNJaEtv?= =?utf-8?B?cTg2UGhFN1hCN3BFNG43WEZHZG1WNVF1cFRFOWI2MDlUYnZKZTI3cWY5dDNL?= =?utf-8?B?TVpKcHZHdmtCcitMUldqMnBVbUo5VzhyeGtyZlpjMU9EOW5PZURVMFRESFRL?= =?utf-8?B?M05GVThZZEx6MWRUa3IyanRmc1kvY0R6RGp5ZDkzYXJvMEdZaFpDY2VKbWRO?= =?utf-8?Q?7kzVg3K4kcuTcZ5z9iYpF04=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH0PR11MB5507.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f35d25a-af45-48b1-e42e-08d9d1b321ea X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jan 2022 07:55:54.7560 (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: TwhxsNGxUbX+NrZ1Rfo9K8mNbF6g6ltcgrUuxKj+aCImXremG6MsADRlKLOGG4NMCGeTbyiljiJK/x2khJZoPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR11MB4247 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for ff_qsv_map_pixfmt 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: "Fu, Linjie" 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Linjie > Fu > Sent: Tuesday, February 25, 2020 10:03 > To: ffmpeg-devel@ffmpeg.org > Cc: Fu, Linjie > Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for > ff_qsv_map_pixfmt > > Return an error directly if pixfmt is not supported for encoding, otherwise > it may be hidden until query/check in MSDK. > > Signed-off-by: Linjie Fu > --- > libavcodec/qsvenc.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 571a711..40ff17c 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -436,7 +436,9 @@ static int init_video_param_jpeg(AVCodecContext > *avctx, QSVEncContext *q) > if (!desc) > return AVERROR_BUG; > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + if (ret < 0) > + return AVERROR_BUG; > > q->param.mfx.FrameInfo.CropX = 0; > q->param.mfx.FrameInfo.CropY = 0; > @@ -537,7 +539,9 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > if (!desc) > return AVERROR_BUG; > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + if (ret < 0) > + return AVERROR_BUG; > > q->param.mfx.FrameInfo.CropX = 0; > q->param.mfx.FrameInfo.CropY = 0; > -- > 2.7.4 LGTM, and I will apply it if no objection. Thanks 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".