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 03F79407EE for ; Wed, 1 Jun 2022 05:16:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD90968B603; Wed, 1 Jun 2022 08:15:58 +0300 (EEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C11A68B48D for ; Wed, 1 Jun 2022 08:15:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654060557; x=1685596557; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=5UiB6EU9CHQW0teBmOUnq+yBBx+jotVmg68OTLTjtEA=; b=KPBFRHaPBiTQ6P44bRC8TmvDfyubmxFGf1FYqHdCS09jVXEvGbr78+X4 EMMW3n25nbGqw2D9sGN7gG/CJ7kfQqvexKtJzkB4TnIYVKAN0k3EZ++xc bBN4o/JicZ6M0adpudzJGgpSxTykSMeU2SUxqolHwanHQGbjT6Ytp4Qqt 2AODCbfZp1WK4dGuogMypbVl0wmM5llIhJfc1Vhf1mxS8hHTPdmPskKmX Hnmt9njvJzQxGNLJ5ZcL/HLFuquTnYn5GKt2IGMMZgQjwEwlZsKqZkQoe bGolXZkDmwG/rYffMLG7DRUKXd7cskh2FxwBt5A3ccKdeh9FhYu5/PXBX A==; X-IronPort-AV: E=McAfee;i="6400,9594,10364"; a="257546827" X-IronPort-AV: E=Sophos;i="5.91,266,1647327600"; d="scan'208";a="257546827" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2022 22:15:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,266,1647327600"; d="scan'208";a="576759412" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga007.jf.intel.com with ESMTP; 31 May 2022 22:15:48 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 31 May 2022 22:15:48 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Tue, 31 May 2022 22:15:48 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.175) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 31 May 2022 22:15:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Di2bNb24hNRIlyeZds/8cvMGJ7lzjbFLlqHpcjIISMVaHC662e9M3kvfnxQ5xB1EHQhvgFacDyBqb5pbatu6+A8nkmfx3i3bQNCmV1z0v/qVs14XluTSS094t+lkb+ppjbDoxDQCpBA2csTetDwIw9jdVTcgVZEzLRZQhLoawcRbD3vA2tG8fDttTh4y9moo4d/DSOqBLN+K9yC6805WTu1OHgrdc2Yxo1ITzE8CdCArEwxhy80RIvcUa7rqgco5xKBed5HP6YOt1leb1QMuIYkAm0KQMpuZdz2E59pVZBhI7gt/KQnbSxE+GEZvjhzcqKreGB5HMQWDIrNwsX04Yw== 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=5UiB6EU9CHQW0teBmOUnq+yBBx+jotVmg68OTLTjtEA=; b=mpe9zTy22PtGNYoM06eO+Cp3JScOm12xgor4kEmzPrz1PGX+7MtH1GPYmG/Sp5KrNKed7/IvjiGQvxDmYJLpFai5IlUq/qcb9iR5VEMvvWuaOe7q8l/UMhWV3FSPHTkIO1xbu/h2EU436TQcMHDKswA7PcqAdW6eJnPXJz0C4smLtbz4uRoRwAi/e90tQWayXnzt+avZMuBCYGlsh7ADgps2NJRU6mrgjqQpL/z5lKDc+gd/FVb6xFmMJyNdgPpGp0B/ris2rCMM/fi0HEi2+tDQWny78e0w6Br06Hfo13MJeasAFbsCCgi/Z7CcnllxQAgyioyXr00IOirG+iKgxw== 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 SN6PR11MB2896.namprd11.prod.outlook.com (2603:10b6:805:d9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 1 Jun 2022 05:15:46 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::2d06:ec38:937a:da73]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::2d06:ec38:937a:da73%6]) with mapi id 15.20.5314.013; Wed, 1 Jun 2022 05:15:46 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders Thread-Index: AQHYcNgJe96hbOkckEGwKua99PBVOq06C5cA Date: Wed, 1 Jun 2022 05:15:46 +0000 Message-ID: <072dec4229597482510b3e75ba0fe2a6c4c3091d.camel@intel.com> References: 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: 7bf9e58b-dc2d-4f21-afbe-08da438dc8c5 x-ms-traffictypediagnostic: SN6PR11MB2896: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: gZSwGpr4pk0OblFc/Vd02MUWH2sCrt+uUoJ1qEzC0hJ7/JbVXYFADeuQoVjVDuYFjt56rsGc4WSZRQGt8zQEBJ0J/CCILN77wJPCIAS+r4S34Cdl1bkvSemrQATWD9+M2wrWi/IDdcG1aAJBUwX7Fek8QhJy2LxRy9c+tAjt51OBuvhTttgfW2J2QGt0jcgu3fLDUk6ml7CpUo87eiA4cVjpu3Ou5+n6h2X7Cdl8940ydK3mbmzhBZQF2Wh4ddpMuS18PevljmtWiTNmQi8kblmtuHSZAZSyWn4DsZjeXOeYbROWfBMCiOgB/xgew+aLfHNznbS6DVzmv8Yvd5dMzeB43P+7N7jmyTf/g+bHsHvhCVNg7dh0nS3Zp7LChihBjEIPxObvipV97j3XCoy2aaQMt8BlYVhH09F0750iSAtNwpsZ9a1N8t6wdrg+dYcoMe+wEC/9m8lfh44nt08xW7esde1cPgtN0hgoRQKFcwHkWjYIniO0kiqBMlirqBezQKmNYIKJy3+YZT+4FpxGrfJK+idTKz4X6dI06JKJn8n218FxZzAUS+QoJ5HNSJsJaoy2e0MrCz9V10vDA6HfvWigXOAZgyWkTjm/6lwZA+NxOXkNmt41QExuz6iDXNAuQZGinRfL2A+hdO9eA/xC9sBKY/6hAcG0czHi3lThJun9/JoI5orOaevEWtt4LSBZwzind01wVp98HZOu9ejWaimCG5PKufOGsoid3EqKxIQ= 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)(2616005)(6506007)(82960400001)(26005)(83380400001)(36756003)(6916009)(316002)(38070700005)(19627235002)(2906002)(6486002)(86362001)(508600001)(8936002)(66556008)(5660300002)(4326008)(8676002)(64756008)(66446008)(66476007)(66946007)(76116006)(91956017)(71200400001)(186003)(38100700002)(6512007)(122000001)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?NHBEcWFRVmNyNllOVDk2WW5tTW83TkQ3TWliQTBlREw5aHY3U2tMQXlyRFRD?= =?utf-8?B?NnVOUm1RaVBDbG90Q1pUWWNkZ1V3bmZBcEtBcW5SQytUenF5bTBEQTBuZzEr?= =?utf-8?B?VVBYZXpabVduMTZ6TFdkT0w0L3RXY242bUhFSU0yQ2orVTJMZG5iSENvUktT?= =?utf-8?B?SmEvNlhOZjVlaysrcEFvdk90amNlVmFNMkVXREtnOEJzcGhxZmkralNsZ0Jt?= =?utf-8?B?SHcvbU9zL28xVUQxRzdYRjN3MHgxdVBDc1JkVWxxazcwUDg2VzFUVFVKWmhB?= =?utf-8?B?dG9SYUY1d2VueldRdXFOaS9vK3pPQUVnUXR5eUcrekxwMDc3YVJvYjZBT3Ji?= =?utf-8?B?SWRUZDRkQmZwZjhNNCt6ZFpWaG1KQkpFWTVOWEJxWWF6WkpCNWYrOVFldnU3?= =?utf-8?B?Qy9tSjJQWEZsVFNyK1hEeFExKzAzSnlTekFDOEZGZlppdVE3cGxNMEdNbDBI?= =?utf-8?B?MTlSWXpzMWdhdFc4OW9jeTFHOXlzOCtrZUxxbWdtQ2NGTFdGOVF0WnBMM3dS?= =?utf-8?B?T21KWXNRZDRsTjU5N1pqeXNZVEQ2Y29WTE9ZREphMjV2bjRYYitxdnZoTW1z?= =?utf-8?B?V3Vzd0FyQTVibFdtVFZWQU1xYWN5RGhrRm1sQ2VKTnZ2SUs2a0phTHZsWVF5?= =?utf-8?B?OVRXSlAyMEJqMzVwL29pak4rbkdGZHZPcndhK29lekZ6ZjRLMWV2ZHMwSVJj?= =?utf-8?B?aTV0RG9OMUpzaVZ1MXJoa2MzRC8xNDErTHJtRlJWdXhCTUZZV2g4Um5xNkZw?= =?utf-8?B?MmpwYzRkSTJhd0h2eEJIZU9xOEpzK3F3bWc5ZU52Y0dWMjQ4NmE3YlFSUVA3?= =?utf-8?B?akdDMGx0TXB1M25KekRsL1pFcGJlNS8vUjI1MVlrdmJkdFF1RnJqREFOQmVR?= =?utf-8?B?UGtuNGdlTjBKR25tOVBIOTdWY2dLSDgzT2Y3aTgvdVp6Y2x2VWtWZExSME0y?= =?utf-8?B?cXdhL2h3MU9nZC9MdElOSTRvV2FHSUdaMTB2RVcvWXVkSDZkVlhjYUFVdmtP?= =?utf-8?B?RXFsQUF2V2QwSmJvOVBHQkZDdzBVVDlaSEliYjRRVkNIblVIZE1PdzQyM1E3?= =?utf-8?B?MVp0ZUtjMkpxSmRvOElhWFJCL1U0cG13TFVrcXpWbDQ0ZVg5eVFQRXlGTTYw?= =?utf-8?B?SVNoV29DV200ZHZpQjBHcytySUQvNjFKOXh4NG4rOVRXNTRMNnhsdHFwdW9m?= =?utf-8?B?OEdzeDJSK2VidHZOWldCUWFhNTFrSmIzVFVsMWxsTkxhY05yYlR2REY1Z3oz?= =?utf-8?B?bm5HekFzVHV3cjdsbWVTang2UStaSEFUclZHdFljUWh4ZjcraFRtVWNmNEJr?= =?utf-8?B?dFVDcjVyb3VlWS9YRWxuZ0tHZmdzZnpqYnJSbmg3UDFQVUhuek0wUUJFMVp4?= =?utf-8?B?R0xOT0Z2T01CMExuU0JUR1l1N0R4c1Q5VVh3aERyUytnNTJzZk1WMmkwM2pp?= =?utf-8?B?MGZZd0t3dDBFTnQ1dnlzRzhaVGNZbXh6dnNGWGVUc2MyWGh1d28zQmF4MlBi?= =?utf-8?B?aUdBMU9obDM1Mk4wZUowVzZFM0Z5TzZodTdEMlo5aW5KQ3ltNDlsS2hUSUpG?= =?utf-8?B?ZldVYnU0Nys0b0FrVU5NL0NSYmlmb21xcWZSRGRmcUNveE1ianc2dDlFc01M?= =?utf-8?B?cTQwai9rZVNWTHQ2ei9qQ3RUdUcyY051VjZrUXpOcEExbk93T2hWcWhvanAy?= =?utf-8?B?SnhJSnJwQk9DOUpESDl6VE8xQTNPR2ltR3BuZWxlRzRvQ1IyelZReGx5Q2hQ?= =?utf-8?B?b3V1QmdsVTRReGxOZ3JEeGo1MEtkV2F6L3I4TDF1M0JRNUVMUUVIRnVFZlRs?= =?utf-8?B?WDVZTzluV09XV2dhOUxGL1JtM3p6eEl2NFJrY3pmbTE3aGxNdjJYSFVYbzR0?= =?utf-8?B?UTQ5QUhXZWNVeUcwa0tsL0dxL1k4MFVHV0ZrWVEvOUdDQjV3UFh6TkFmZkF5?= =?utf-8?B?ekxqMGVTa2NIVlVDK040NGhRZDJCbWtDSFBMcTFjZUJ1RnhEdHY4a1U1T0E4?= =?utf-8?B?K0NqUWNtWVREMUp5am9pbzdTK3dvSnJXbDd1ZVA3SWllTUlKb21NaFJCd0Rk?= =?utf-8?B?d2pVeS9icGw3Sjk0NFRtTWdPdlR5ajJGMTFvZk5YOW1xdC9YS3BGSzhHMmpo?= =?utf-8?B?WWN4dC9OaFM2T0pia29FWFkyT05UMUxyYUF0NXBjQ0RFditKZDROZVdMS05o?= =?utf-8?B?VEFvU0dNV29RMXZ3TzJOR2RMMTJSVkZUZTZOd0NPdkNoM1I1QVR3YVhtUGNk?= =?utf-8?B?T0g4OEZhRERGWk1BNHloa1A1SWdVT0ZzQTdaY1BsUzNueTYvcGNiaGdTdDZC?= =?utf-8?B?UVlhZHorTjlPV2NVbEJGSkk4TzRKNmpQVzhUUzlTZENoUlJkMDExSVRTa1B6?= =?utf-8?Q?aomCx4jv4jnpCzgA=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: 7bf9e58b-dc2d-4f21-afbe-08da438dc8c5 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Jun 2022 05:15:46.3882 (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: DZfWeHZOPnw+4E2oh8c9Rt/rKS5gVNL3qeNantRmw5Wl22emnY+DXgrOCd7N/JbZ9UIc59HWLmXjsgNZm7hoyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2896 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders 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: "softworkz@hotmail.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 Thu, 2022-05-26 at 08:08 +0000, softworkz wrote: > From: softworkz > > Signed-off-by: softworkz > --- > libavcodec/qsvdec.c | 233 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 233 insertions(+) > > diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c > index 5fc5bed4c8..7d6a491aa0 100644 > --- a/libavcodec/qsvdec.c > +++ b/libavcodec/qsvdec.c > @@ -49,6 +49,12 @@ > #include "hwconfig.h" > #include "qsv.h" > #include "qsv_internal.h" > +#include "h264dec.h" > +#include "h264_sei.h" > +#include "hevcdec.h" > +#include "hevc_ps.h" > +#include "hevc_sei.h" > +#include "mpeg12.h" > > static const AVRational mfx_tb = { 1, 90000 }; > > @@ -60,6 +66,8 @@ static const AVRational mfx_tb = { 1, 90000 }; > AV_NOPTS_VALUE : pts_tb.num ? \ > av_rescale_q(mfx_pts, mfx_tb, pts_tb) : mfx_pts) > > +#define PAYLOAD_BUFFER_SIZE 65535 > + > typedef struct QSVAsyncFrame { > mfxSyncPoint *sync; > QSVFrame *frame; > @@ -101,6 +109,9 @@ typedef struct QSVContext { > > mfxExtBuffer **ext_buffers; > int nb_ext_buffers; > + > + mfxU8 payload_buffer[PAYLOAD_BUFFER_SIZE]; > + Mpeg1Context mpeg_ctx; I wonder why only mpeg1 context is required in QSVContext. > } QSVContext; > > static const AVCodecHWConfigInternal *const qsv_hw_configs[] = { > @@ -599,6 +610,208 @@ static int qsv_export_film_grain(AVCodecContext *avctx, > mfxExtAV1FilmGrainParam > return 0; > } > #endif > +static int find_start_offset(mfxU8 data[4]) > +{ > + if (data[0] == 0 && data[1] == 0 && data[2] == 1) > + return 3; > + > + if (data[0] == 0 && data[1] == 0 && data[2] == 0 && data[3] == 1) > + return 4; > + > + return 0; > +} > + > +static int parse_sei_h264(AVCodecContext* avctx, QSVContext* q, AVFrame* out) > +{ > + H264SEIContext sei = { 0 }; > + GetBitContext gb = { 0 }; > + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], .BufSize = > sizeof(q->payload_buffer) }; > + mfxU64 ts; > + int ret; > + > + while (1) { > + int start; > + memset(payload.Data, 0, payload.BufSize); > + > + ret = MFXVideoDECODE_GetPayload(q->session, &ts, &payload); > + if (ret != MFX_ERR_NONE) { > + av_log(avctx, AV_LOG_WARNING, "error getting SEI payload: %d \n", > ret); Better to use AV_LOG_ERROR to match the description. > + return ret; > + } > + > + if (payload.NumBit == 0 || payload.NumBit >= payload.BufSize * 8) { > + break; > + } > + > + start = find_start_offset(payload.Data); > + > + switch (payload.Type) { > + case SEI_TYPE_BUFFERING_PERIOD: > + case SEI_TYPE_PIC_TIMING: > + continue; > + } > + > + if (init_get_bits(&gb, &payload.Data[start], payload.NumBit - start * > 8) < 0) > + av_log(avctx, AV_LOG_ERROR, "Error initializing bitstream > reader"); > + else I think it should return an error when failed to initialize GetBitContext, and the `else` statement is not needed. > + ret = ff_h264_sei_decode(&sei, &gb, NULL, avctx); > + > + if (ret < 0) > + av_log(avctx, AV_LOG_WARNING, "Error parsing SEI type: > %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); Better to use AV_LOG_ERROR and return an error. Otherwise please use 'warning' instead of 'error' in the description. > + else > + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d Numbits %d\n", > payload.Type, payload.NumBit); > + } > + > + if (out) > + return ff_h264_export_frame_props(avctx, &sei, NULL, out); > + > + return 0; > +} > + > +static int parse_sei_hevc(AVCodecContext* avctx, QSVContext* q, QSVFrame* > out) > +{ > + HEVCSEI sei = { 0 }; > + HEVCParamSets ps = { 0 }; > + GetBitContext gb = { 0 }; > + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], .BufSize = > sizeof(q->payload_buffer) }; > + mfxFrameSurface1 *surface = &out->surface; > + mfxU64 ts; > + int ret, has_logged = 0; > + > + while (1) { > + int start; > + memset(payload.Data, 0, payload.BufSize); > + > + ret = MFXVideoDECODE_GetPayload(q->session, &ts, &payload); > + if (ret != MFX_ERR_NONE) { > + av_log(avctx, AV_LOG_WARNING, "error getting SEI payload: %d \n", > ret); > + return 0; It returns an error in parse_sei_h264() when MFXVideoDECODE_GetPayload fails to get the payload. Please make the behavior consistent across the codecs. (I'm fine to return 0 instead of an error to ignore errors in SEI decoding. ) > + } > + > + if (payload.NumBit == 0 || payload.NumBit >= payload.BufSize * 8) { > + break; > + } > + > + if (!has_logged) { > + has_logged = 1; > + av_log(avctx, AV_LOG_VERBOSE, "-------------------------------- > ---------\n"); > + av_log(avctx, AV_LOG_VERBOSE, "Start reading SEI - payload > timestamp: %llu - surface timestamp: %llu\n", ts, surface->Data.TimeStamp); > + } > + > + if (ts != surface->Data.TimeStamp) { > + av_log(avctx, AV_LOG_WARNING, "GetPayload timestamp (%llu) does > not match surface timestamp: (%llu)\n", ts, surface->Data.TimeStamp); > + } > + > + start = find_start_offset(payload.Data); > + > + av_log(avctx, AV_LOG_VERBOSE, "parsing SEI type: %3d Numbits > %3d Start: %d\n", payload.Type, payload.NumBit, start); > + > + switch (payload.Type) { > + case SEI_TYPE_BUFFERING_PERIOD: > + case SEI_TYPE_PIC_TIMING: > + continue; > + case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: > + // There seems to be a bug in MSDK > + payload.NumBit -= 8; > + > + break; > + case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: > + // There seems to be a bug in MSDK > + payload.NumBit = 48; > + > + break; > + case SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35: > + // There seems to be a bug in MSDK > + if (payload.NumBit == 552) > + payload.NumBit = 528; > + break; > + } > + > + if (init_get_bits(&gb, &payload.Data[start], payload.NumBit - start * > 8) < 0) > + av_log(avctx, AV_LOG_ERROR, "Error initializing bitstream > reader"); > + else I think it should return an error when failed to initialize GetBitContext and the `else` statement is not needed. > + ret = ff_hevc_decode_nal_sei(&gb, avctx, &sei, &ps, > HEVC_NAL_SEI_PREFIX); > + > + if (ret < 0) > + av_log(avctx, AV_LOG_WARNING, "error parsing SEI type: > %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); > + else > + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d Numbits %d\n", > payload.Type, payload.NumBit); > + } > + > + if (has_logged) { > + av_log(avctx, AV_LOG_VERBOSE, "End reading SEI\n"); > + } > + > + if (out && out->frame) > + return ff_set_side_data(avctx, &sei, NULL, out->frame); > + > + return 0; > +} > + > +static int parse_sei_mpeg12(AVCodecContext* avctx, QSVContext* q, AVFrame* > out) > +{ > + Mpeg1Context *mpeg_ctx = &q->mpeg_ctx; > + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], .BufSize = > sizeof(q->payload_buffer) }; > + mfxU64 ts; > + int ret; > + > + while (1) { > + int start; > + > + memset(payload.Data, 0, payload.BufSize); > + ret = MFXVideoDECODE_GetPayload(q->session, &ts, &payload); > + if (ret != MFX_ERR_NONE) { > + av_log(avctx, AV_LOG_WARNING, "error getting SEI payload: %d \n", > ret); WARNING or ERROR ? > + return ret; > + } > + > + if (payload.NumBit == 0 || payload.NumBit >= payload.BufSize * 8) { > + break; > + } > + > + start = find_start_offset(payload.Data); > + > + start++; > + > + ff_mpeg_decode_user_data(avctx, mpeg_ctx, &payload.Data[start], > (int)((payload.NumBit + 7) / 8) - start); > + > + if (ret < 0) Here ret is always MFX_ERR_NONE > + av_log(avctx, AV_LOG_WARNING, "error parsing SEI type: > %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); > + else > + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d Numbits %d > start %d -> %.s\n", payload.Type, payload.NumBit, start, (char > *)(&payload.Data[start])); > + } > + > + if (!out) > + return 0; > + > + if (mpeg_ctx->a53_buf_ref) { > + > + AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, > AV_FRAME_DATA_A53_CC, mpeg_ctx->a53_buf_ref); > + if (!sd) > + av_buffer_unref(&mpeg_ctx->a53_buf_ref); > + mpeg_ctx->a53_buf_ref = NULL; > + } > + > + if (mpeg_ctx->has_stereo3d) { > + AVStereo3D *stereo = av_stereo3d_create_side_data(out); > + if (!stereo) > + return AVERROR(ENOMEM); > + > + *stereo = mpeg_ctx->stereo3d; > + mpeg_ctx->has_stereo3d = 0; > + } > + > + if (mpeg_ctx->has_afd) { > + AVFrameSideData *sd = av_frame_new_side_data(out, AV_FRAME_DATA_AFD, > 1); > + if (!sd) > + return AVERROR(ENOMEM); > + > + *sd->data = mpeg_ctx->afd; > + mpeg_ctx->has_afd = 0; > + } > + > + return 0; > +} > > static int qsv_decode(AVCodecContext *avctx, QSVContext *q, > AVFrame *frame, int *got_frame, > @@ -636,6 +849,8 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext > *q, > insurf, &outsurf, sync); > if (ret == MFX_WRN_DEVICE_BUSY) > av_usleep(500); > + else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO || avctx->codec_id > == AV_CODEC_ID_MPEG2VIDEO) We didn't add qsv decoder for AV_CODEC_ID_MPEG1VIDEO in qsvdec.c > + parse_sei_mpeg12(avctx, q, NULL); > > } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_ERR_MORE_SURFACE); > > @@ -677,6 +892,24 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext > *q, > return AVERROR_BUG; > } > > + switch (avctx->codec_id) { > + case AV_CODEC_ID_MPEG1VIDEO: > + case AV_CODEC_ID_MPEG2VIDEO: No support for AV_CODEC_ID_MPEG1VIDEO. Thanks Haihao > + ret = parse_sei_mpeg12(avctx, q, out_frame->frame); > + break; > + case AV_CODEC_ID_H264: > + ret = parse_sei_h264(avctx, q, out_frame->frame); > + break; > + case AV_CODEC_ID_HEVC: > + ret = parse_sei_hevc(avctx, q, out_frame); > + break; > + default: > + ret = 0; > + } > + > + if (ret < 0) > + av_log(avctx, AV_LOG_ERROR, "Error parsing SEI data\n"); > + > out_frame->queued += 1; > > aframe = (QSVAsyncFrame){ sync, out_frame }; _______________________________________________ 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".