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 A79BE42925 for ; Mon, 10 Jan 2022 07:08:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2784668AE7A; Mon, 10 Jan 2022 09:07:59 +0200 (EET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2A696805AE for ; Mon, 10 Jan 2022 09:07:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641798478; x=1673334478; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=24JV0BfT8YfjjlECpnvUSM/6KvV7kerc0EmvKzSEBwk=; b=kZLe65u0S/c0qOENXF1tq0rIjLzBcWsZ/Qpxhkq2Vz1ZMa+wrRCpm+fG OI3lsoyJ45wFOqAyC1ehWg5ZfRBp4b+xR6qxMWE4SQVLZE1CbVCoVyI71 3ze5i5No5KdKWLigogn/qrwwLJf+5NEXbZlFWALbpKK2AM3ILVwa4DI5U Wn2iqQfkKU51J1pbVA4M4frHmoVJrIOgK+jT1qViBbRq1gDUG7DwHttDB aoo7mCH1uV7IEYfQ3nlkWjPI1RUYEDFr4E5J8ci7EfiNI5frSm1yvekVx o/MBlxht9tltxGfSi8D8Z95X/353/ajxulUn2kwt9M6fa7m7wDkiSZgmp w==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="306525253" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="306525253" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 23:07:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="669372678" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga001.fm.intel.com with ESMTP; 09 Jan 2022 23:07:50 -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; Sun, 9 Jan 2022 23:07:50 -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; Sun, 9 Jan 2022 23:07:50 -0800 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.20; Sun, 9 Jan 2022 23:07:49 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gZRWkgySTpZHwg/RQ8EDxVkUtkh5MHZsbxcg77uY05BkPQmpnXkj5sZlms0wmuNEbCrFVoEM92n43pVqCO2e9hrbbnl3yStZVNvnuHomQBJsB/fX30miPwtbWo9IdYkzlvD3Eg5GXIfcPE/SfaUF9WAQQFdGEDDRSOO++Uwj8w0BrB9WTW24fP7s+kfedqdSWAKimygvFLXCeZ5iUuCBTRvHD9zRlXmH6xquFnVbHaYRYInq+ahvTUTugmp7qPB3y+e4fU2Fd6E7B5B3u0jL8ZfLyNzJajZkW12sgh3e7IRpncLlPhztEL3PniQYBvD+B1+2bJV3tD3NMc8PXgLcLQ== 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=24JV0BfT8YfjjlECpnvUSM/6KvV7kerc0EmvKzSEBwk=; b=BEgWJfYugSGHyifoWk0srEQoihF7hfOo+WFvhyN/rW1ZsVc4eySEgWerq6+w/DeWa+VMase7PgbgFMAI0kE90B14CUtGouO/NrRiCMwIReCD3UvSo/knmXSdtWF/DxgUTKlsjpsRT4spHISLHQDAayq5Jzkuf7v1Y9bpYcAzrptj1H84HfmGI+5PtJqWQS65whKjRBTHa+qpBqOuDe+Hc4NE9iaoaX8Hti0tkqrdVGEGYlSzmOVsKv/moRPKQ00QXjq4UUbu6cWpJRJcWboTLTdoRXDqXMCbCyoaXyTJ9detP4GcFmWRzF1LZ6poGSJ9j2lnExlpIiv4jvCwuOCLmQ== 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 BN6PR11MB0034.namprd11.prod.outlook.com (2603:10b6:405:6b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Mon, 10 Jan 2022 07:07:48 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::d436:c6ab:6e71:8843]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::d436:c6ab:6e71:8843%6]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 07:07:48 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for ff_qsv_map_pixfmt Thread-Index: AQHV64Au4o+MfUnn7EOuXgR0+S0Pr6xbXx0AgASrZwA= Date: Mon, 10 Jan 2022 07:07:48 +0000 Message-ID: <894a6c6b8f534ee7ce671a98ed933b43897dcc49.camel@intel.com> References: <1582596153-1442-1-git-send-email-linjie.fu@intel.com> In-Reply-To: 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: 13b12d2e-e3e8-4c78-f097-08d9d407e8ab x-ms-traffictypediagnostic: BN6PR11MB0034: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: rkvydXXNCDXbygT7op4yPI8LtezvVtV4ZFOzY2f+gic78TlYGMnz/ETVRFut1/bG+Dzy5mzED/w3EiWxdHmMcJJ/P6/cO5/z7Q9ypcKEVctwYrYZStRleBFYdc3mE8F9E74meB7JNb7gEAEdToQqrDozWcM1etNTYxfFgP5S8zhS46c4Sh0nZC0NarpRFf47p9sQLsp6rquxpQjpqF+RP+BaCzWrhUU4zssOBBu85aAgCUOHUbRqBXJCvsTWV8Z7VGz4jaIEWgGTKhgLBB+OJ3Kr3v+vJVcVTvcqhq++OvHmAgjLJf+MJZxj0pvIUD4SwoLOrdwaEKXRHeHcZhmZgiKaQE9i1Pv1gfC2+e2AezDP/8Fts38+wkyjIH08ZcTA7hMwTKgVtYw8IpZE1XCP/D/93lqm6wYHrK4KhQdiutHtsJBIBncGvjloG1jcrP02ZrJMG6c0aDsXbjs4je2v+LdXWnf6E+JpEvJkH5uIzQe92tVCDOWaPEY+ich+LrTW4NuXdr8SF26wZ5BE94aX6srEgm5ev664dvDWvFvqhgJXJpI9ubNgAKm0ZDLS5N1faRMEDSKmiHf+lSN0KeG+yqe4hmITVbfQeiFPC1JzHhNiI6RNx/fJ6iYbdXCFPdXLXdQHgke57xl4oPRWNkdZZn1iFcESabIixqGK4+URdKWek7XN1LemxCGUfGCz0w1G2hCbfOkp2wzZzwhHb47r0Nay3QOqd92njP+V/fF07RU= 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:(366004)(82960400001)(316002)(5660300002)(8936002)(83380400001)(38070700005)(38100700002)(71200400001)(66446008)(6486002)(107886003)(122000001)(6512007)(66946007)(6916009)(36756003)(6506007)(26005)(91956017)(53546011)(2906002)(508600001)(186003)(64756008)(86362001)(2616005)(4326008)(66556008)(66476007)(76116006)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?SHk3b1ZmcmZBQ0k5NkpuQXhBbmxHcy9zMkdUWlFublhFelRqZVFmZmNrOURH?= =?utf-8?B?MjZIcEx5Q0ZybXZlaE4vMVpodWdKdUJPUDkvcWJMb2tTWWwzUzZRa2toazIv?= =?utf-8?B?Zk9LazUzcFV1WGZHRzNsSTgrd3o1T0VxS0h6NmxicVJ4RHdVdkNpWm1aQVIv?= =?utf-8?B?SmtKZFlhbWI1WlAzYTFyTEs5MEEwVmFvZUdHTXU4UXU2aXpBME5nYk9qMnA4?= =?utf-8?B?STJJYkN5QzdIdkd2VDVLTHdhRmZ6cTZRNWNTcGVkZ0FhZnJISjc3eWdXbFBr?= =?utf-8?B?UDRmd1VpR0FiOC9zWFhUeDNGYWhBZ3Rrbmo3ZVNnc2hTcjBCNE40NjN2czhk?= =?utf-8?B?RVpMTnlkcDdKdVpWWEo5UU5KZ1RQSlZNWTZxa01aSmkrOUZuQlBPWStiVHla?= =?utf-8?B?MTcwN0YrYnE0eFdsZ2ZUakpQNmhheGFxdnhJdE14ZjJleHBZR3J6RjRRdzF0?= =?utf-8?B?MzN2NGxTdnFOTGRsQzlLV3FjdDZPUXhmNStSL3dEQWptQXZuQzNlSE5YQ3JK?= =?utf-8?B?all5cElBZWV4ZlVkU1dIRnBZWVNUU3lLcWxjaG9ucHJJWmZ3NUdNNjVaNm9V?= =?utf-8?B?YzE4VmJxZGM3dVMreVR2c0x0Q3hVOFBwbUk4Wkx4R1I4KzhjS3p1V2QrUmI4?= =?utf-8?B?blJxREdRTTVvU0NFZ3BNZnRWZUg0d1F0REpFZDcyaHd0MG91NTZNb1U0cHVq?= =?utf-8?B?TkR3bjVudUdpdzg0bC9YMVNLRlB6WDZDc0NEdXNMMEswZi9rWVFnR0NnNE50?= =?utf-8?B?R2JFeXFwcU9GaGtvemM2Rk5xNVZJUWczS3dmbVdBaTFYWTBZQkxiUTZOWlBu?= =?utf-8?B?aWpOb2VpSFBPQkZRWENFNTJoSlhiUkl4UXExT3JOYnhFN3NKUURkYzJWd2My?= =?utf-8?B?RHc5aktqS0MvWllwdy8yM1ZTOFkvcUd0bzhSZm9VK2tjeDhhcExhWnpVTk9R?= =?utf-8?B?Q1pEMXBwOEt0ODF6eTZBY3NQa3greVJia0M0endiaW1oRzVUTmZnRGJZMTdM?= =?utf-8?B?bkR4MzI2OU45LzBwRjFVR1Z2STVQUk5pS05qVXRxUThndVVoU2s1eThaWWp6?= =?utf-8?B?a3ZPd1cySHh2N2RScDQxOG96UTFtaVYzQ0xneC9nNHJybWVXTDN2L1g0dzNu?= =?utf-8?B?bEtjZTNOTTdrYjlJQ3N2UUVRU1ZjdmE4MTVDcWlITWpPamNrbFFmeWN5ZGtE?= =?utf-8?B?OGV2aktrZytlV1M2clZwazJvbU8rUHlSZVZVUEN6dWRoQkpSc1Voa0lXYjZU?= =?utf-8?B?ajdBMnFOQndzbEVyakxSTkpGME9hakVmTFlTQXlEQ2dKMzNERFJiUUVEK2lI?= =?utf-8?B?SEtWQmp1OCtCOVJUTGh0L2hUOWYrbi9CZGQ4TmhiT3ZsTEZ4UHI2RGJGZWU1?= =?utf-8?B?cVphVkk2d2RPU09QMTYvam9icnhxN2t0N0hLRU9GNXM5dDJ5UVNSckUwQXlP?= =?utf-8?B?YWJtREMySTQvcWxIY0JDLy9mRGFxWlplTjRFV3ZrY1Rsbk1ZVjllbzU1Z05x?= =?utf-8?B?WjU4Y08xbzNLOHpYUXBGKzhwRXlwd1pEbU5EaTBsbks2eEZUOVZRMHh1Uk1E?= =?utf-8?B?c1BXd0hZK0hHaG5tQmpJM2hGTXl4TDVWVkZ3M1ROSFZkV2ZyYXNTcDVINGNx?= =?utf-8?B?alAvU1hhYlhpQ05FeDlZTEtOSGdrYlB6SWdBMHVuYmt2Z2RxNE13REkzWERD?= =?utf-8?B?NytrTFRnNEpnSVg5YkxDT2kyVDlRUC8yU0RIT1dtWjNhR3gxaFVvUVZKM3d0?= =?utf-8?B?elB0WXlwQmlNMjRQOTBKdDRsTzFVVmE5anV2RkFkeHQzUStjcjd3Rk4rVzlY?= =?utf-8?B?Tk9VNnI5OXpOVHFLL1poSjVNYlNyYkkzbktIRjdZWStlYkVkMnVvT0tRSThp?= =?utf-8?B?RGhBZS8zVjh1V3FXaUFPM2Nqajl2Q0NwOXRkdVVBMkxUeXZKT1o5SFphQnBl?= =?utf-8?B?czdRTVpPME1CSVJwbDhGMnNPb2tpdEd1VGpsdWFNUE8vdWEvSFlxR3RBaFVl?= =?utf-8?B?ZUxYZncxOTJwaEFBRnFlSUllOWFyUGp5cVgwSUh3UTIzTUlVUHRSaUpxU0l1?= =?utf-8?B?cWMvRENmVGE4L2p3UktRT2IrdjUyWlBkWmk2dW1lc3hJQ1RnWW5TTWtNRlJw?= =?utf-8?B?d3pYVWxZWGJ4dm42Zkh2RFBPRmhoRCsrOFAydEdQMTVPcXExR090dW9NdklV?= =?utf-8?Q?EC77n2Y3SgQm8SKhdJbyoic=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: 13b12d2e-e3e8-4c78-f097-08d9d407e8ab X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2022 07:07:48.2608 (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: HivB45bAVMkiq3NauElpXSniZ03sYqucrDRf+gmSB2PFrUVQWG93u6y4ueucVTWJlUxI8vIP/HZt8cPJdpbqTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB0034 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: "linjie.fu@intel.com" 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 Fri, 2022-01-07 at 07:55 +0000, Xiang, Haihao wrote: > > -----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. > Applied, thx! -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".