From patchwork Mon Nov 29 18:51:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31798 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6577244iob; Mon, 29 Nov 2021 10:52:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYzywKwGVZSTYcsRuWO9rY6LsL2GLk0gbXuS9c/C+gyYJsCD2486BvjM8Z5EN7XN8jFsrV X-Received: by 2002:a05:6402:268e:: with SMTP id w14mr76755760edd.48.1638211927312; Mon, 29 Nov 2021 10:52:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qk8si25126457ejc.230.2021.11.29.10.52.06; Mon, 29 Nov 2021 10:52:07 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=mph5fORO; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7DC968A9A8; Mon, 29 Nov 2021 20:51:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2036.outbound.protection.outlook.com [40.92.19.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DD286808E6 for ; Mon, 29 Nov 2021 20:51:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TRntAEStCqW5E63NmzOE7aTyvzGVTntpUI8n4tL98g1Hb2msqH8Ik1neMyxyjXyriguNCRUKBj18VcB2MVJNwQjglJq5SKqmpGiloNIcWf3i9+mByx1jmeGt3w7Dd+v3Wye2fnbNuJBlpkdPjfRrNwjWxW59q9bwiTdRStg009jro+khOnUWwSil5312oKolKy3wshANGrk8rLrNQiY85TV8P70wXBYADKU1Yb8WIrWa9MOnkHXumXw+kv1rkgRU9gJuqGymG3YAXj0ODGhSFHkrcbjT+1tvx2qaG4FSMRFV5vMo3fuxVJdEL93oeQ9BKWoudZqgKSoZz0waEAb5VA== 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=UV6i6rX5/EBZHS/0Uvcz4b6n1BQsv9/CsJgN5mkeXAM=; b=NtIb24ZKa2a9cI994FBp+FQZYHVA/QicepcNhzPDUIs9/Ek93SyiO0Fkj8fsluIuVMXgw4nHowqM7UgtbCqQgJhNH/2nwEC8oHuXN6k+ann+bQv3ZzUtwxDPss7JMPIUVXerjBCAsvAQDnx7BaXaqL03Ruc9PqjcUqOTCHaSd9T48KGo5RtMxgfKWyeksAxvdjWChnJpcV7tJCF383ue0wWg7CKAk4EBCtaTPRaptAu6UB8b9q5nCP/+gr3vCWwnlDk29xeO36H9B5qpnZkDRH2iWjW5RMM1Hvcg4SwiOCFxTTKtklDqUmYYv5dabLEvV/inH0TdwiSyKCySr0ty3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UV6i6rX5/EBZHS/0Uvcz4b6n1BQsv9/CsJgN5mkeXAM=; b=mph5fOROfpaaO4JMbHzpDi1T9nShKnyRUDx2ZpyClK0Ayc1lnz727NbopW25YygBAmSTCO/nZ0b/rShAD+rtZdNJlmukb1Lohv/RsCpEX5Mwh5MfwYy9GUXB7MNXBiSCZIE1OHzgg3ussRTXkRKtOBhEA0QdkUEb1xHxhTnibsrBCuFzYsykjkY0mC5oatHRgT+feW+wqHxxEbpS/NNi5vvyoHrSuKpDgkgZxk/AY403CnvUlymxNuC3FV4FcKe1p40xQt+YrDHavaj+16dx/vQ97UQBCSzFWS13eI+IcQdK53hlNceB2XRSfHFEdH1nhFuAr/YxPWSEM8MOdiRJ7Q== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0125.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 18:51:46 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 18:51:45 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/5] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible Thread-Index: AQHX5VIoTZYhXOHWnEuqIrmROfDxAQ== Date: Mon, 29 Nov 2021 18:51:45 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [L91p4MWGN1RMXLP2QK/5FV9KxGGroFjx] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7009925f-daa0-4b90-cd50-08d9b3694adb x-ms-traffictypediagnostic: DM8P223MB0125: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VTNEiHuj+0HmMOMln9iQnV0OJYOI0uItpCJvtzsYW9kwDOOQPyfELKKCI4GUqZmJ0IREYGHlUP/EqEG7ezYxyh0ak8w2X47Gq1VJ3phPMeTs11rnPhPuxrQo1RExeYM1y4vePQneLnky0gnuU3mH2pyxFW5xkeYDeh90PtrPJa0PtRo0Azo01M9m8aO7+tF9/gWjwQmvR4aFXwqVc4E5iQhE8mG9C8g/opKFoatRpwr9bew8T+xGJ9UK8yMQc33/qkojNL5asVifcnoqzDULHTF1GC5eEiGZ1JUfJZGx5cJAAjCKVj0OjMNCiGO1tSCX955ml6OaS7xawbeLjLCz7s2ih0yQcxZWeYzefh6y52L/K63le34lSa5SLK7j7WL5jN+L6qT1D/qyl16VE4IEWmsoK/+DlVrPQD3H+ClPphJqzNdqppdzAIiuvoTkEneI+mt+ZglzO+PLjeBdZh7FHg3cS53pXtXgsWEH4vDU754AYBNFQoGJ3XhtarQYSUbyBQy8qTVXN9BQ8eqE+op30Pcv/HozKlPeOB4CCr+mzCDgYRWCp2bx3T5YfUsXXXzBJ3kXys7PFsSe+whb3dwmdA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: aTKOM2xL5613fPJJa4rXlwDN3mlvDrFHTeUDRNStXlz7y5YdmmJ+SKHodidjsl3yHejV4E+AZZyR9v4TxBVkhfvCzZDMYnT57Oh6AREPsx759ZL29EYQvAmFahy3GjonqV+JltGiRoK9NnO1fEtl9sKyS96Y3tzUvlIffGQIJL2tKnDEcpMFki1mcXJd4ciJEZEF3PWVoqYWCK+qbJtecMV+/S3BzPRXzQD6zo/hbSWropiK4NTXjfki+nLCy7HqQ04C0ItBfXg67qO9jo8emBai4r/WfrQ72PZS/BW51TStOoR1hqg33qXR7ldf6quTaJ0sJGFjjwHn9C5JPLg09j1RK30xd4qoSIGhJECzkD5VehNVrMS711BaLQNhQXQho2rNr61ojYfmQV2lu80ajhvmurH9XJqkzRz1G5w3qjxvm5RXDhIRPmvHMPM6+yYwb455u6rdvkOp6DWhjvATNUcC2aji9OU6WKqoy3eEF7QWo/zsNklDmikHRLKhIAjHJec/LY+3OaOOWKRWdPnAXAa+XZTXsp5q/3VZYADRiH7Fdfv0DFiiDmRJ9W7GrMQjdnIUcG6egt15HE1ykDZ/yhv3yIh5IYnr5e37QzI2XneSfHj1KLuZHfW/CPr4ZQB7T0YY/oEArPbKozeZqSkzvs/T4KaRXEZYI6Ilx1JleS9sdjiScre/botcUy5/1cbvW3YKQvhxvd2wURkCXOhGvg== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 7009925f-daa0-4b90-cd50-08d9b3694adb X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 18:51:45.8004 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0125 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible 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: O8nWxRgxerny Signed-off-by: softworkz --- libavcodec/mpeg12.h | 25 +++++++++++++++++++++++++ libavcodec/mpeg12dec.c | 36 +++++------------------------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index fb2b37e7c8..630afa4072 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -24,6 +24,7 @@ #include "mpeg12vlc.h" #include "mpegvideo.h" +#include "libavutil/stereo3d.h" /* Start codes. */ #define SEQ_END_CODE 0x000001b7 @@ -35,6 +36,28 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 +typedef struct Mpeg1Context { + MpegEncContext mpeg_enc_ctx; + int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ + int repeat_field; /* true if we must repeat the field */ + AVPanScan pan_scan; /* some temporary storage for the panscan */ + AVStereo3D stereo3d; + int has_stereo3d; + AVBufferRef *a53_buf_ref; + uint8_t afd; + int has_afd; + int slice_count; + AVRational save_aspect; + int save_width, save_height, save_progressive_seq; + int rc_buffer_size; + AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ + int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ + int tmpgexs; + int first_slice; + int extradata_decoded; +} Mpeg1Context; + + void ff_mpeg12_common_init(MpegEncContext *s); #define INIT_2D_VLC_RL(rl, static_size, flags)\ @@ -84,4 +107,6 @@ void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, int *code, int *ext_n, int *ext_d, int nonstandard); +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size); + #endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 09b2902bca..09f2535a6a 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -53,27 +53,6 @@ #define A53_MAX_CC_COUNT 2000 -typedef struct Mpeg1Context { - MpegEncContext mpeg_enc_ctx; - int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ - int repeat_field; /* true if we must repeat the field */ - AVPanScan pan_scan; /* some temporary storage for the panscan */ - AVStereo3D stereo3d; - int has_stereo3d; - AVBufferRef *a53_buf_ref; - uint8_t afd; - int has_afd; - int slice_count; - AVRational save_aspect; - int save_width, save_height, save_progressive_seq; - int rc_buffer_size; - AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ - int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ - int tmpgexs; - int first_slice; - int extradata_decoded; -} Mpeg1Context; - #define MB_TYPE_ZERO_MV 0x20000000 static const uint32_t ptype2mb_type[7] = { @@ -2232,11 +2211,9 @@ static int vcr2_init_sequence(AVCodecContext *avctx) return 0; } -static int mpeg_decode_a53_cc(AVCodecContext *avctx, +static int mpeg_decode_a53_cc(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size) { - Mpeg1Context *s1 = avctx->priv_data; - if (buf_size >= 6 && p[0] == 'G' && p[1] == 'A' && p[2] == '9' && p[3] == '4' && p[4] == 3 && (p[5] & 0x40)) { @@ -2367,12 +2344,9 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, return 0; } -static void mpeg_decode_user_data(AVCodecContext *avctx, - const uint8_t *p, int buf_size) +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size) { - Mpeg1Context *s = avctx->priv_data; const uint8_t *buf_end = p + buf_size; - Mpeg1Context *s1 = avctx->priv_data; #if 0 int i; @@ -2386,7 +2360,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, int i; for(i=0; i<20; i++) if (!memcmp(p+i, "\0TMPGEXS\0", 9)){ - s->tmpgexs= 1; + s1->tmpgexs= 1; } } /* we parse the DTG active format information */ @@ -2432,7 +2406,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, break; } } - } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) { + } else if (mpeg_decode_a53_cc(avctx, s1, p, buf_size)) { return; } } @@ -2624,7 +2598,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, } break; case USER_START_CODE: - mpeg_decode_user_data(avctx, buf_ptr, input_size); + ff_mpeg_decode_user_data(avctx, s, buf_ptr, input_size); break; case GOP_START_CODE: if (last_code == 0) { From patchwork Mon Nov 29 18:51:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31799 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6577405iob; Mon, 29 Nov 2021 10:52:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/PqbxHWGwrXXNd0pwMAWJewwAtT2ZwnMnVAlRIcEyCYbpa1xtsnJf6iKg4MzSK7vLYSJ9 X-Received: by 2002:a50:fb16:: with SMTP id d22mr78287933edq.367.1638211939141; Mon, 29 Nov 2021 10:52:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sg38si30002836ejc.17.2021.11.29.10.52.18; Mon, 29 Nov 2021 10:52:19 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=ohxrIprS; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28E4268AC4D; Mon, 29 Nov 2021 20:52:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2036.outbound.protection.outlook.com [40.92.19.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8636868AB82 for ; Mon, 29 Nov 2021 20:51:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jHjN2ITTg6pAt34J7nj2Ydo3aIZ5qy/PBFea2is+eEnXZ82V67g8iM8SI5k6ypjXC54+6d0VyaayuGOMozcAWUmUmRT9/v1CvErB7B6zWLgfJXUdAoqgTYl3V+0WLidyUAolJ1mbvRuhEvsKS2AkP8H4EJVfQpwA8eFDraOCvXzPeeNPkidPFP3WTIUYLXlumSYpQbJJI1/T6a1H2Mn0JdmhLA5xUoHWBxVLs0r9GPqYnZStJ8xyw5vfvIl4LFzrCSLyliYkm8m5GLBfMvnFWq93WyiA5Hr87xezuhoH1dwJ58mBB2bkPE6iHDzHkrTCR4H/niVjz4Kvt5iE1KdR0A== 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=pfIo+5fI6nVV+h3HqUaiCGWnww3+oaFdaubWJcidztU=; b=NTZu/NaTomJNsD9q6XIEDp8bseg9vEtkdT/92cQz+7Q5oFHGBpO/CPIBAgLLgsBmaQQpQMLos2fZLuLg7+uhZHCZaPu5uPMvn4G2bZLYisr07At2J2gDR+bYrjPL1xS4q6heHJYZZhEygJDpz//gVv8plqdgNvmkg058ggeF4N0AmH8nZagN1COjVTqNZyWU/MfGRLFI+gcK1nJNk8KEr8E07xhdWnvNih2ZhpndexZqTWQF7dKzoS83+VQ9sWP8M/HuiKty6hIjoLQFKcu87ul6vmTLQQkLS0Wnqau1Xhlr4IZD96bsq8pmMJCY4AkqZt+PrTLSmmadiUHwTZfAkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pfIo+5fI6nVV+h3HqUaiCGWnww3+oaFdaubWJcidztU=; b=ohxrIprSlCI0hdRabmYLAh98u+/m3A14QkR5cXRKL4hB5a5YckwVaxF5JzK7sxV1lm7kpePm3hGSS5QTHQhjUEAMjb3TkKUk6iy6OogoKkKKgCOSQEYjZTnnSMO4ou0IlhtrGZy+mKUX6wTznlCSgyNBH7uVbVcqweBggYoTnisdeiplwc29rBLaLM8bpSCh/Ac8mCv0UEp7V1Sa0kcEitcqRfyez4hKFnKKoG1oPXceYbP9imOj/eVVWH56CoDx2MGWQrGvxezmTidUNGNoSCagTayjY39Uq1OrJyYXG5V8FLBo12H/LdSqjBj7k0krKLEpAQpAHtqcyIBOdCvLiw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0125.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 18:51:48 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 18:51:48 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 2/5] avcodec/hevcdec: make set_side_data() accessible Thread-Index: AQHX5VIpWWhQ8JM93k+LjYHppSsAOQ== Date: Mon, 29 Nov 2021 18:51:48 +0000 Message-ID: References: <62b3a721e463650b46e527abcc9169ec1cc3e9f8.1638210102.git.softworkz@hotmail.com> In-Reply-To: <62b3a721e463650b46e527abcc9169ec1cc3e9f8.1638210102.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [1+HWhV5rHX1SuUNdCrCBmAZn3WhX6Bww] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2e9d926c-eb60-4841-24bf-08d9b3694c3f x-ms-traffictypediagnostic: DM8P223MB0125: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Ianf3c3CQq8P01waIgc3CAkITkfAi9aoDE6bKpgkoAcDxPLewQy2FG4Z82r3XO5Jb01prp0NTHtqRnyNDII7HUpwS9S1oCTtgAhc53Biq1kv2SqXWnaZJxwuYmKV3Xd2qK/wbUoheDc/0WbDREd1qUuuedaH1z7e0NJ/KJuizqle+n36+qYEg/IpCTRCorMkbej1tLUIcr9bwne4+M1qWleDgmKP4FafvyfRcmm+CEOR/YQZdAZtZdlsn620LJFdFgmR0RZfRUwOmJmhPaJDqxRjxvzqasYkCgeITlZkR+lJXusGshZRKT6JoLvhQiF6Mxt02xHR9NZK2o16bdi4QEsOi1t2uArbUp8WhLqq7ox/GiI+r2517ysHJIFZczuZP04UiCQ7c7wMFTaBTqutShAWYJQiz3TdavBJN1nU6P73/BUkVA/6XQMfOXhMm/3DlTHkIv5BLYC9z062a+ga4snaGt63MXi56U3S/Rsvl3sRAj2pczoF238mi0Ar2rFsvj3X7Wxzis2FJ2dYgen+rOPVC0k5E4HQxRNL9cMJpWihO1M8kFYgZHazCBC5PforzBXkjLKoepmx/WY3+m0FYQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: /+Ktq6SSvFfc8QKY9Lqg7JG1UCamoG3G3mBKQatAqt3wnb2ECQbcjC2NZszgLvS2ArTAo8QurCZP0Wx5izEQRhDLgQljDBB20gNMVlB7eopEnTIP0lqEQmhBqFq+I/ZIHDBMBEEVGCUDeZf0awRGWP6Cgled+EUD4gusv7ZmBBdrJrrymRVrOO0IB6HfcwRjk80y0KxhpWZECA1+JpQAmp7rFwcTRK6sCJFIIwBu0oPltVGbQPYIWReNgGrBnDTlppZjMSxyekc1fTbhuHWURWo3WjZvDXX214VTdceKVqYLUEbI/6+pegxpwtMvvrp7QE2ROAb/deFWcWTkFc5LMpPEs21nZqgL+2G1oiVzs6hsa/BVDCQgJkly1MGdW+181ivr981nKx5oSmvqEyhzVTT5j1TXaS6KGW3YrBf0UxXQue3H2pgQtFlNk5U1rFvRwjB9leyOUPioVKSR2TNeeUJTdajjEG65IfMD5U/POzNAmpf3wMIb0heofxviqFzDZpVsgtT1pitVOdjovx5YlO5VVc4hejhIAUMX7Zn/m9U+ml7GAtRUZtkx8/dZAt+6VE9wjoVVOI4HjZSlcqTSfMuasOSSGd/0M83dD2YKNM1Yuuy6HnKuxTBz9wt13ZHnzFSYDFKeUEaKuMx/K9iMYbxHVFFCxD57E1q1/CNKPqRwmf1aamBwHqV5QkyNhvosEx2uhzejLDttnAWJn5rR1A== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 2e9d926c-eb60-4841-24bf-08d9b3694c3f X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 18:51:48.0496 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0125 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/hevcdec: make set_side_data() accessible 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: kS2KbLn2CySV Signed-off-by: softworkz --- libavcodec/hevcdec.c | 112 +++++++++++++++++++++---------------------- libavcodec/hevcdec.h | 2 + 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 46d9edf8eb..53593d6186 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2720,22 +2720,20 @@ error: return res; } -static int set_side_data(HEVCContext *s) +int ff_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, HEVCContext *s, AVFrame *out) { - AVFrame *out = s->ref->frame; - - if (s->sei.frame_packing.present && - s->sei.frame_packing.arrangement_type >= 3 && - s->sei.frame_packing.arrangement_type <= 5 && - s->sei.frame_packing.content_interpretation_type > 0 && - s->sei.frame_packing.content_interpretation_type < 3) { + if (sei->frame_packing.present && + sei->frame_packing.arrangement_type >= 3 && + sei->frame_packing.arrangement_type <= 5 && + sei->frame_packing.content_interpretation_type > 0 && + sei->frame_packing.content_interpretation_type < 3) { AVStereo3D *stereo = av_stereo3d_create_side_data(out); if (!stereo) return AVERROR(ENOMEM); - switch (s->sei.frame_packing.arrangement_type) { + switch (sei->frame_packing.arrangement_type) { case 3: - if (s->sei.frame_packing.quincunx_subsampling) + if (sei->frame_packing.quincunx_subsampling) stereo->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX; else stereo->type = AV_STEREO3D_SIDEBYSIDE; @@ -2748,21 +2746,21 @@ static int set_side_data(HEVCContext *s) break; } - if (s->sei.frame_packing.content_interpretation_type == 2) + if (sei->frame_packing.content_interpretation_type == 2) stereo->flags = AV_STEREO3D_FLAG_INVERT; - if (s->sei.frame_packing.arrangement_type == 5) { - if (s->sei.frame_packing.current_frame_is_frame0_flag) + if (sei->frame_packing.arrangement_type == 5) { + if (sei->frame_packing.current_frame_is_frame0_flag) stereo->view = AV_STEREO3D_VIEW_LEFT; else stereo->view = AV_STEREO3D_VIEW_RIGHT; } } - if (s->sei.display_orientation.present && - (s->sei.display_orientation.anticlockwise_rotation || - s->sei.display_orientation.hflip || s->sei.display_orientation.vflip)) { - double angle = s->sei.display_orientation.anticlockwise_rotation * 360 / (double) (1 << 16); + if (sei->display_orientation.present && + (sei->display_orientation.anticlockwise_rotation || + sei->display_orientation.hflip || sei->display_orientation.vflip)) { + double angle = sei->display_orientation.anticlockwise_rotation * 360 / (double) (1 << 16); AVFrameSideData *rotation = av_frame_new_side_data(out, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); @@ -2771,17 +2769,17 @@ static int set_side_data(HEVCContext *s) av_display_rotation_set((int32_t *)rotation->data, angle); av_display_matrix_flip((int32_t *)rotation->data, - s->sei.display_orientation.hflip, - s->sei.display_orientation.vflip); + sei->display_orientation.hflip, + sei->display_orientation.vflip); } // Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1 // so the side data persists for the entire coded video sequence. - if (s->sei.mastering_display.present > 0 && + if (s && sei->mastering_display.present > 0 && IS_IRAP(s) && s->no_rasl_output_flag) { - s->sei.mastering_display.present--; + sei->mastering_display.present--; } - if (s->sei.mastering_display.present) { + if (sei->mastering_display.present) { // HEVC uses a g,b,r ordering, which we convert to a more natural r,g,b const int mapping[3] = {2, 0, 1}; const int chroma_den = 50000; @@ -2794,25 +2792,25 @@ static int set_side_data(HEVCContext *s) for (i = 0; i < 3; i++) { const int j = mapping[i]; - metadata->display_primaries[i][0].num = s->sei.mastering_display.display_primaries[j][0]; + metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; metadata->display_primaries[i][0].den = chroma_den; - metadata->display_primaries[i][1].num = s->sei.mastering_display.display_primaries[j][1]; + metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; metadata->display_primaries[i][1].den = chroma_den; } - metadata->white_point[0].num = s->sei.mastering_display.white_point[0]; + metadata->white_point[0].num = sei->mastering_display.white_point[0]; metadata->white_point[0].den = chroma_den; - metadata->white_point[1].num = s->sei.mastering_display.white_point[1]; + metadata->white_point[1].num = sei->mastering_display.white_point[1]; metadata->white_point[1].den = chroma_den; - metadata->max_luminance.num = s->sei.mastering_display.max_luminance; + metadata->max_luminance.num = sei->mastering_display.max_luminance; metadata->max_luminance.den = luma_den; - metadata->min_luminance.num = s->sei.mastering_display.min_luminance; + metadata->min_luminance.num = sei->mastering_display.min_luminance; metadata->min_luminance.den = luma_den; metadata->has_luminance = 1; metadata->has_primaries = 1; - av_log(s->avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); - av_log(s->avctx, AV_LOG_DEBUG, + av_log(logctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); + av_log(logctx, AV_LOG_DEBUG, "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", av_q2d(metadata->display_primaries[0][0]), av_q2d(metadata->display_primaries[0][1]), @@ -2821,31 +2819,31 @@ static int set_side_data(HEVCContext *s) av_q2d(metadata->display_primaries[2][0]), av_q2d(metadata->display_primaries[2][1]), av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1])); - av_log(s->avctx, AV_LOG_DEBUG, + av_log(logctx, AV_LOG_DEBUG, "min_luminance=%f, max_luminance=%f\n", av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); } // Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1 // so the side data persists for the entire coded video sequence. - if (s->sei.content_light.present > 0 && + if (s && sei->content_light.present > 0 && IS_IRAP(s) && s->no_rasl_output_flag) { - s->sei.content_light.present--; + sei->content_light.present--; } - if (s->sei.content_light.present) { + if (sei->content_light.present) { AVContentLightMetadata *metadata = av_content_light_metadata_create_side_data(out); if (!metadata) return AVERROR(ENOMEM); - metadata->MaxCLL = s->sei.content_light.max_content_light_level; - metadata->MaxFALL = s->sei.content_light.max_pic_average_light_level; + metadata->MaxCLL = sei->content_light.max_content_light_level; + metadata->MaxFALL = sei->content_light.max_pic_average_light_level; - av_log(s->avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); - av_log(s->avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", + av_log(logctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); + av_log(logctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", metadata->MaxCLL, metadata->MaxFALL); } - if (s->sei.a53_caption.buf_ref) { - HEVCSEIA53Caption *a53 = &s->sei.a53_caption; + if (sei->a53_caption.buf_ref) { + HEVCSEIA53Caption *a53 = &sei->a53_caption; AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_A53_CC, a53->buf_ref); if (!sd) @@ -2853,8 +2851,8 @@ static int set_side_data(HEVCContext *s) a53->buf_ref = NULL; } - for (int i = 0; i < s->sei.unregistered.nb_buf_ref; i++) { - HEVCSEIUnregistered *unreg = &s->sei.unregistered; + for (int i = 0; i < sei->unregistered.nb_buf_ref; i++) { + HEVCSEIUnregistered *unreg = &sei->unregistered; if (unreg->buf_ref[i]) { AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, @@ -2865,9 +2863,9 @@ static int set_side_data(HEVCContext *s) unreg->buf_ref[i] = NULL; } } - s->sei.unregistered.nb_buf_ref = 0; + sei->unregistered.nb_buf_ref = 0; - if (s->sei.timecode.present) { + if (s && sei->timecode.present) { uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside = av_frame_new_side_data(out, AV_FRAME_DATA_S12M_TIMECODE, @@ -2876,25 +2874,25 @@ static int set_side_data(HEVCContext *s) return AVERROR(ENOMEM); tc_sd = (uint32_t*)tcside->data; - tc_sd[0] = s->sei.timecode.num_clock_ts; + tc_sd[0] = sei->timecode.num_clock_ts; for (int i = 0; i < tc_sd[0]; i++) { - int drop = s->sei.timecode.cnt_dropped_flag[i]; - int hh = s->sei.timecode.hours_value[i]; - int mm = s->sei.timecode.minutes_value[i]; - int ss = s->sei.timecode.seconds_value[i]; - int ff = s->sei.timecode.n_frames[i]; + int drop = sei->timecode.cnt_dropped_flag[i]; + int hh = sei->timecode.hours_value[i]; + int mm = sei->timecode.minutes_value[i]; + int ss = sei->timecode.seconds_value[i]; + int ff = sei->timecode.n_frames[i]; tc_sd[i + 1] = av_timecode_get_smpte(s->avctx->framerate, drop, hh, mm, ss, ff); av_timecode_make_smpte_tc_string2(tcbuf, s->avctx->framerate, tc_sd[i + 1], 0, 0); av_dict_set(&out->metadata, "timecode", tcbuf, 0); } - s->sei.timecode.num_clock_ts = 0; + sei->timecode.num_clock_ts = 0; } - if (s->sei.film_grain_characteristics.present) { - HEVCSEIFilmGrainCharacteristics *fgc = &s->sei.film_grain_characteristics; + if (s && sei->film_grain_characteristics.present) { + HEVCSEIFilmGrainCharacteristics *fgc = &sei->film_grain_characteristics; AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(out); if (!fgp) return AVERROR(ENOMEM); @@ -2948,8 +2946,8 @@ static int set_side_data(HEVCContext *s) fgc->present = fgc->persistence_flag; } - if (s->sei.dynamic_hdr_plus.info) { - AVBufferRef *info_ref = av_buffer_ref(s->sei.dynamic_hdr_plus.info); + if (sei->dynamic_hdr_plus.info) { + AVBufferRef *info_ref = av_buffer_ref(sei->dynamic_hdr_plus.info); if (!info_ref) return AVERROR(ENOMEM); @@ -2959,7 +2957,7 @@ static int set_side_data(HEVCContext *s) } } - if (s->rpu_buf) { + if (s && s->rpu_buf) { AVFrameSideData *rpu = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DOVI_RPU_BUFFER, s->rpu_buf); if (!rpu) return AVERROR(ENOMEM); @@ -3015,7 +3013,7 @@ static int hevc_frame_start(HEVCContext *s) goto fail; } - ret = set_side_data(s); + ret = ff_set_side_data(s->avctx, &s->sei, s, s->ref->frame); if (ret < 0) goto fail; diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 870ff178d4..b0d2f2e169 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -691,6 +691,8 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size); +int ff_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, HEVCContext *s, AVFrame *out); + extern const uint8_t ff_hevc_qpel_extra_before[4]; extern const uint8_t ff_hevc_qpel_extra_after[4]; extern const uint8_t ff_hevc_qpel_extra[4]; From patchwork Mon Nov 29 18:51:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31796 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6577592iob; Mon, 29 Nov 2021 10:52:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJw31u4ndIGuTiUN2lAR3hqdWx3acrkt1HHdqrunWIRB1mc4bZXMgN7PwWxoEE132w/5kAUw X-Received: by 2002:a05:6402:514d:: with SMTP id n13mr79501830edd.380.1638211951915; Mon, 29 Nov 2021 10:52:31 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t1si21807405ejg.360.2021.11.29.10.52.31; Mon, 29 Nov 2021 10:52:31 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=TvXmUmM5; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5663868AC7B; Mon, 29 Nov 2021 20:52:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2036.outbound.protection.outlook.com [40.92.19.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE8DE68A8EE for ; Mon, 29 Nov 2021 20:52:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BvZwjTlcv1VDUJrEVROhbKUN5BaCZFDFv6HN5P5K6VEs1hQDYGBWsxRzps3lNdRxCJZ52JMzn50YQRM8D3avFJ7UrbGjLW/7d6b7vq20CJm/KTHdGDV6FmZpPr3rk0YIgi35pTFvq4Hn0tyiVWlOvCW2zsmso8n13wfmHFCDhA+8S5u4Dj9vO/mqon3gkEJPJOJqmUDUjyoFdLd9lstWJusE6DjKw4BuwuV4EcoDpI4uP68cF3KavtUX7p7IPyP+9vCQlo5QIyuBoz0s3t1lU2mqOlXfa2rPqYIDifJR31z6LVqciwfu9O/BkwVeNHlcfXB2wsua7kjCAiNQhIgZDA== 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=yd3xoClzLNV00HS8+OYjN00X/WrpVGZGWD28HRsto0c=; b=G4RGk7BiV3aACM1Gug3+O00SH/7UsdtHeXKms/48cpa0MITRgM9N75qNsbKo/ZRY09+B9FLL6wJNNiD7nc09FrfCFrtrUG7FiS3acRk9NQUjNwYECqDSDoIqMT86CVB/sv1VuC/WutlCsPRU+bOKt2Gzh2R3VO+pXV9c67ltiHn87Id5AjzMbF+/4V9xscEWFf7G7itwKqtchP4dWnaCCpEonun21qtl4Gdw+taompYWGyNIB7qzcrNkrIhuaj+MMSK+L8//H0txDM5phjiY6yixMopxoGPNxe2yDizoAklUIg6sb7Et0jqcLHOiYqLnaVP2aNE0XGLy3zSaj9nTLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yd3xoClzLNV00HS8+OYjN00X/WrpVGZGWD28HRsto0c=; b=TvXmUmM5/rlEnXzeX7YRRD0LJubEw7AVvipM2+JvLVrWSQfdLvxfS0SxKicMHctRAUZ1361lwAYKTITVdV8/rKlSMxUAmvJO4dMTk1fHFM0YComzmcnBpbJkCj/BdeK2VNWBQjtPSJ42qbMPKEKDEy6cPPyNKHb4PyVY3J3AkkmKG116nv7CbnY3fv9W2BngHUvmX5SScDaHhC94GHKsi7fIdA/yGUYt+Euifz8fX+DU8oPfRrQ7mQVPdg7hDsHZH77iQx8oZBWjzV6JQtWSqsWRBQEmGXaz7udHvALkTDEVBg5OMb5O8uOB80kmJ+Dh2aQwdz1yt6exPxBpJsA05A== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0125.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 18:51:50 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 18:51:50 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 3/5] avcodec/h264dec: make h264_export_frame_props() accessible Thread-Index: AQHX5VIrU6vcRGytmkuM5JyUtdA9YA== Date: Mon, 29 Nov 2021 18:51:50 +0000 Message-ID: References: <62b3a721e463650b46e527abcc9169ec1cc3e9f8.1638210102.git.softworkz@hotmail.com> <2362f84d0e53c691dbf248743c6640c91d83a491.1638210102.git.softworkz@hotmail.com> In-Reply-To: <2362f84d0e53c691dbf248743c6640c91d83a491.1638210102.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [DqFi/6fPSOggrVO+FhR7Warl+/VgIf2Q] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0e6dd0ae-97a2-4a7f-f900-08d9b3694dd0 x-ms-traffictypediagnostic: DM8P223MB0125: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ieqN6qgDJR5p8Ss5NMeVYEbIPvlldcipTDlKRUnNRATQnHp+ashv4N/RPUvRO+3nOaylaDlngIEm4N6tpYGLcX+v9O5rSpcjCls6Tkf+FmopSbLMfn2JCh5pKBxU7IBYjsAo8hPoMnWynEH+vHk0NAVccQwVlJb3kFRG3GwWaqEDGmqkKKyQPKZCURIWwYOrR0Lpl+OACN06ywbw0Mcdi2gUKyWZa+skCWP+J3zOsqY5AjX3e9ayJ064VxGVYUwNUUbG7znnXETMI0hJOF6SWOUhvvyeMr2tlPv75KpddPnP/yqk1Pu+g74ph6WgnDM9xs8gM7kRM+yUUYKzOdPtiLy0vWTfa4SOHuFtaA8psDxHfVYnWK1mAofKdcSKKOk7kAZEMtLWXqnEFHJ2cz1hqzuKIEKt5AieTaqCmX2K8gxtS88lQOlR1TpkK1Hq51w4I2OWkjcfd92zpY0PoLDocwWi8xVY4dgziT5S82OmkeAzwVV3L3ieuhx+PhxkvaiUSoPTJ/cmeNM4O4zw5yrrlkZKwNY25kNTXnClCo7mHpRWoZ9aIev/v1uCUuC8KtxRuIgGxAz3l/O2Ow4Nre3VNQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: vKkHeVK7tgRoMjKb1m2gyESimVIKfiFtjwjsxx2E6a/0fL/q1FqkFjGLSH4rq6WQsAQFRYrMILdqR76OWVUnuczYnyFq1fMxcLzX1mGT6iWtj9+gknTLp1bNAvZ0xMdJFUGJ/9MTdbC8qiHT4tkEA5SXmI6ovNlSGsKkrmtl9i1Y4mtSt8vHzpD3UvkMUsbUa3jSgtOh53CLuiUr4eAjcNdlSIM7hVdgk9sYpvNrvydU6SHJpfhcFrzP5fDLnjzB2YNQX//+SGcgf+CddAE3ornkcNgd5sEMfGMvk9PtqwdcdarBJK0HlkY9wN4OSOkcg1mN5Wl9O7K74084ZLbTHfbnaFLbh0A2m8Ay7lICZOTz0PyEYgzF3VZSLmJwKKyaxaWgMVSr6iVCviEh6YEUohe7uBCo9lXpG5Cr4LkXZUlxZ8Z50n/UUcRM9A2AFEPScokQV75caN9s5buCN8I1r4blR4nixgiLjfkUGsZuiilci7Z270zk6cRt2i5LOOY5mkhbvXaadlChNFZvprJTK8FbAqzMtzQ+FTcerawDRXxk4py6iX3wAW5i12bcssDOhlCifYCS+Vi9oIgMJE3cvrCxHmhlfJ6UI2YUlVaXYB22ZgQlr/EBCsU2esgUpjZMiJuhfejGjUmllKlHVJdhe+V0gu8UrTOa400OweB+ESB76kkfTXHlZQmoChmREnXd0JdmTczfGugpFJULi3DW3w== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 0e6dd0ae-97a2-4a7f-f900-08d9b3694dd0 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 18:51:50.7338 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0125 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/h264dec: make h264_export_frame_props() accessible 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: AS7Y6xkdviDT Signed-off-by: softworkz --- libavcodec/h264_slice.c | 98 +++++++++++++++++++++-------------------- libavcodec/h264dec.h | 2 + 2 files changed, 52 insertions(+), 48 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 4467882775..5c1f38de03 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1163,11 +1163,10 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl return 0; } -static int h264_export_frame_props(H264Context *h) +int ff_h264_export_frame_props(AVCodecContext *logctx, H264SEIContext *sei, H264Context *h, AVFrame *out) { - const SPS *sps = h->ps.sps; - H264Picture *cur = h->cur_pic_ptr; - AVFrame *out = cur->f; + const SPS *sps = h ? h->ps.sps : NULL; + H264Picture *cur = h ? h->cur_pic_ptr : NULL; out->interlaced_frame = 0; out->repeat_pict = 0; @@ -1175,19 +1174,19 @@ static int h264_export_frame_props(H264Context *h) /* Signal interlacing information externally. */ /* Prioritize picture timing SEI information over used * decoding process if it exists. */ - if (h->sei.picture_timing.present) { - int ret = ff_h264_sei_process_picture_timing(&h->sei.picture_timing, sps, - h->avctx); + if (sps && sei->picture_timing.present) { + int ret = ff_h264_sei_process_picture_timing(&sei->picture_timing, sps, + logctx); if (ret < 0) { - av_log(h->avctx, AV_LOG_ERROR, "Error processing a picture timing SEI\n"); - if (h->avctx->err_recognition & AV_EF_EXPLODE) + av_log(logctx, AV_LOG_ERROR, "Error processing a picture timing SEI\n"); + if (logctx->err_recognition & AV_EF_EXPLODE) return ret; - h->sei.picture_timing.present = 0; + sei->picture_timing.present = 0; } } - if (sps->pic_struct_present_flag && h->sei.picture_timing.present) { - H264SEIPictureTiming *pt = &h->sei.picture_timing; + if (h && sps && sps->pic_struct_present_flag && sei->picture_timing.present) { + H264SEIPictureTiming *pt = &sei->picture_timing; switch (pt->pic_struct) { case H264_SEI_PIC_STRUCT_FRAME: break; @@ -1221,21 +1220,23 @@ static int h264_export_frame_props(H264Context *h) if ((pt->ct_type & 3) && pt->pic_struct <= H264_SEI_PIC_STRUCT_BOTTOM_TOP) out->interlaced_frame = (pt->ct_type & (1 << 1)) != 0; - } else { + } else if (h) { /* Derive interlacing flag from used decoding process. */ out->interlaced_frame = FIELD_OR_MBAFF_PICTURE(h); } - h->prev_interlaced_frame = out->interlaced_frame; - if (cur->field_poc[0] != cur->field_poc[1]) { + if (h) + h->prev_interlaced_frame = out->interlaced_frame; + + if (sps && cur->field_poc[0] != cur->field_poc[1]) { /* Derive top_field_first from field pocs. */ out->top_field_first = cur->field_poc[0] < cur->field_poc[1]; - } else { - if (sps->pic_struct_present_flag && h->sei.picture_timing.present) { + } else if (sps) { + if (sps->pic_struct_present_flag && sei->picture_timing.present) { /* Use picture timing SEI information. Even if it is a * information of a past frame, better than nothing. */ - if (h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM || - h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP) + if (sei->picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM || + sei->picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP) out->top_field_first = 1; else out->top_field_first = 0; @@ -1249,11 +1250,11 @@ static int h264_export_frame_props(H264Context *h) } } - if (h->sei.frame_packing.present && - h->sei.frame_packing.arrangement_type <= 6 && - h->sei.frame_packing.content_interpretation_type > 0 && - h->sei.frame_packing.content_interpretation_type < 3) { - H264SEIFramePacking *fp = &h->sei.frame_packing; + if (sei->frame_packing.present && + sei->frame_packing.arrangement_type <= 6 && + sei->frame_packing.content_interpretation_type > 0 && + sei->frame_packing.content_interpretation_type < 3) { + H264SEIFramePacking *fp = &sei->frame_packing; AVStereo3D *stereo = av_stereo3d_create_side_data(out); if (stereo) { switch (fp->arrangement_type) { @@ -1295,11 +1296,11 @@ static int h264_export_frame_props(H264Context *h) } } - if (h->sei.display_orientation.present && - (h->sei.display_orientation.anticlockwise_rotation || - h->sei.display_orientation.hflip || - h->sei.display_orientation.vflip)) { - H264SEIDisplayOrientation *o = &h->sei.display_orientation; + if (sei->display_orientation.present && + (sei->display_orientation.anticlockwise_rotation || + sei->display_orientation.hflip || + sei->display_orientation.vflip)) { + H264SEIDisplayOrientation *o = &sei->display_orientation; double angle = o->anticlockwise_rotation * 360 / (double) (1 << 16); AVFrameSideData *rotation = av_frame_new_side_data(out, AV_FRAME_DATA_DISPLAYMATRIX, @@ -1311,29 +1312,30 @@ static int h264_export_frame_props(H264Context *h) } } - if (h->sei.afd.present) { + if (sei->afd.present) { AVFrameSideData *sd = av_frame_new_side_data(out, AV_FRAME_DATA_AFD, sizeof(uint8_t)); if (sd) { - *sd->data = h->sei.afd.active_format_description; - h->sei.afd.present = 0; + *sd->data = sei->afd.active_format_description; + sei->afd.present = 0; } } - if (h->sei.a53_caption.buf_ref) { - H264SEIA53Caption *a53 = &h->sei.a53_caption; + if (sei->a53_caption.buf_ref) { + H264SEIA53Caption *a53 = &sei->a53_caption; AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_A53_CC, a53->buf_ref); if (!sd) av_buffer_unref(&a53->buf_ref); a53->buf_ref = NULL; - h->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; + if (h) + h->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } - for (int i = 0; i < h->sei.unregistered.nb_buf_ref; i++) { - H264SEIUnregistered *unreg = &h->sei.unregistered; + for (int i = 0; i < sei->unregistered.nb_buf_ref; i++) { + H264SEIUnregistered *unreg = &sei->unregistered; if (unreg->buf_ref[i]) { AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, @@ -1344,10 +1346,10 @@ static int h264_export_frame_props(H264Context *h) unreg->buf_ref[i] = NULL; } } - h->sei.unregistered.nb_buf_ref = 0; + sei->unregistered.nb_buf_ref = 0; - if (h->sei.film_grain_characteristics.present) { - H264SEIFilmGrainCharacteristics *fgc = &h->sei.film_grain_characteristics; + if (h && sps && sei->film_grain_characteristics.present) { + H264SEIFilmGrainCharacteristics *fgc = &sei->film_grain_characteristics; AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(out); if (!fgp) return AVERROR(ENOMEM); @@ -1401,7 +1403,7 @@ static int h264_export_frame_props(H264Context *h) h->avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; } - if (h->sei.picture_timing.timecode_cnt > 0) { + if (h && sei->picture_timing.timecode_cnt > 0) { uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE]; @@ -1412,14 +1414,14 @@ static int h264_export_frame_props(H264Context *h) return AVERROR(ENOMEM); tc_sd = (uint32_t*)tcside->data; - tc_sd[0] = h->sei.picture_timing.timecode_cnt; + tc_sd[0] = sei->picture_timing.timecode_cnt; for (int i = 0; i < tc_sd[0]; i++) { - int drop = h->sei.picture_timing.timecode[i].dropframe; - int hh = h->sei.picture_timing.timecode[i].hours; - int mm = h->sei.picture_timing.timecode[i].minutes; - int ss = h->sei.picture_timing.timecode[i].seconds; - int ff = h->sei.picture_timing.timecode[i].frame; + int drop = sei->picture_timing.timecode[i].dropframe; + int hh = sei->picture_timing.timecode[i].hours; + int mm = sei->picture_timing.timecode[i].minutes; + int ss = sei->picture_timing.timecode[i].seconds; + int ff = sei->picture_timing.timecode[i].frame; tc_sd[i + 1] = av_timecode_get_smpte(h->avctx->framerate, drop, hh, mm, ss, ff); av_timecode_make_smpte_tc_string2(tcbuf, h->avctx->framerate, tc_sd[i + 1], 0, 0); @@ -1814,7 +1816,7 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, * field coded frames, since some SEI information is present for each field * and is merged by the SEI parsing code. */ if (!FIELD_PICTURE(h) || !h->first_field || h->missing_fields > 1) { - ret = h264_export_frame_props(h); + ret = ff_h264_export_frame_props(h->avctx, &h->sei, h, h->cur_pic_ptr->f); if (ret < 0) return ret; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 87c4e4e539..c887f5f2a4 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -872,4 +872,6 @@ void ff_h264_free_tables(H264Context *h); void ff_h264_set_erpic(ERPicture *dst, H264Picture *src); +int ff_h264_export_frame_props(AVCodecContext *logctx, H264SEIContext *sei, H264Context *h, AVFrame *out); + #endif /* AVCODEC_H264DEC_H */ From patchwork Mon Nov 29 18:51:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31794 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6577758iob; Mon, 29 Nov 2021 10:52:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyCj/JGZTXBUVx3naT/0nt+LKtIKq70MyRZN3I5ASiGwfBc1l4dKsS1oNSK4Qf+eZTPPgs X-Received: by 2002:a05:6402:1e92:: with SMTP id f18mr75532608edf.153.1638211964143; Mon, 29 Nov 2021 10:52:44 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j8si22777223edr.47.2021.11.29.10.52.43; Mon, 29 Nov 2021 10:52:44 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=MfnfQK8r; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8296568ADAB; Mon, 29 Nov 2021 20:52:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2036.outbound.protection.outlook.com [40.92.19.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29A6568AC65 for ; Mon, 29 Nov 2021 20:52:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nRpdevRRbIXgM6TJUqgqYogcBqKoD/CGmJmoskWQeM22hf/cdpbrkd70T6FiWmpzxx4QsTdpaeP2gVbfSJONriAvdjz2uN/dI1cSpzIvkqNqCNASTbhvWbPTRSLBz7yYF5Grv1E+wrt7ban/PvK4Mv6DSbAlb3hZasL2gFH3LZaAIAErlTdQQF2mgJ4CA0XcHxVrf7OnnL14OEhEGdyc3+9neosyOoGeSyNs6a2583olCRxQsXrsl42Hc3g7GQBj6CX/P6h04c7VrbRHcdwJGWpwTHYjRsqXWCtMcN/WAqr/39Ai+J6jDs+KrsE9L5RN8xVkWB7tMD0I3nZmhCTZAg== 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=oBYLyagNHPqFIwvHYAsxSeNRB/y96h4dcAD1zP7bLUw=; b=ch9U20nk5Uy0WneXx69p06vAqXe56b5GZHrb7PJtuExgReMSb7iQ6jcoObZbYmpJWxvPi2mUewEEaC9ukq7Ao21k6/sULMl07R1YqnWYuGZ4/LsrR1tlM2fbD8hrwshLx4PqJt4BW5xt5kQdxjKeMll52hBN12Y3N+CpAa41yS1rb8jKR+vmIN7s7bpxSEa81W7HWdQJafGW/sPNBNc9CzDEDIYx8rkPIfpnq2ZmnWcqkWeIpRrzcbXy/TLtc1H+GyjLjh1YbuDAypqE/jbyTYcs/ska5VYj8UPZNJ4aRvP2E8bjTNcfkvZNuqLM21u0WTS57djb/0eAoNZTX2uBjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oBYLyagNHPqFIwvHYAsxSeNRB/y96h4dcAD1zP7bLUw=; b=MfnfQK8r0KfzebZ1gPJoDNOyURcAUQodzVOPOX8gFcvvX+I+qT/XWpb7Gi8i15+zJPiAnaAQmjEuWoLTrRGGX4dyFyDwdqhKnFnWeNbYfUr9INjZgIWRFx8hBU+kWlBT1bYC6jbWsxgOBFOl/qijKr3mgmS6fhnKa69ELkt30jztveWwFzWRuzFkPRl764HbtDULP2lAkYvhz3n2SEsVGYexdVKW3bZeOBvnYFWobtQYRRXlU9UqiwW6gXMSD/w6AFPrVPZwhDYxPf9tfzCnExqSDoYRKfLdXf07vARBoCmlsvm8Sfjk8G/TdpRQ+HPZ5+R7zGvPbbt54Y2dsz02zg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0125.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 18:51:53 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 18:51:53 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 4/5] avcodec/qsvdec: Implement SEI parsing for QSV decoders Thread-Index: AQHX5VItL51I6lSqrUScM3lHJGTAKA== Date: Mon, 29 Nov 2021 18:51:53 +0000 Message-ID: References: <62b3a721e463650b46e527abcc9169ec1cc3e9f8.1638210102.git.softworkz@hotmail.com> <2362f84d0e53c691dbf248743c6640c91d83a491.1638210102.git.softworkz@hotmail.com> <5a3b242f9bedd7453a810eae1edf78918726d12c.1638210102.git.softworkz@hotmail.com> In-Reply-To: <5a3b242f9bedd7453a810eae1edf78918726d12c.1638210102.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [q73L4nignPM0rWfjrD72zJT5Uwl/wqru] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6f0e3789-859c-43df-e038-08d9b3694fab x-ms-traffictypediagnostic: DM8P223MB0125: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: anmf/hEHgizmswvdPjAay8FZalPs5dOKyHFuc8xoWciUhGwZ1lZhX46w0sY1AF2HI5TJuKe4fZ0a4O7noGxSjNLMBzvghhZ7FoFWPs8Tu8F+ULqwkXLezTgA4WfxjNSSkQWeTwugbEC9na66GwkGODyu3ko2aEdIJ1ZGpTDrxepga5XNk8kbbbo53qM3fRaUM8wh0FsyO5Z2WDVVWLqXldZA/mAQgOcbHjZpP3k1uRgilJm/s/jjbvCZKI0PLnviDSvSXf9u9iBWA8zu9azg9y4XgQyVJDTuYxBVCkbfW7Po/79GIAPjoQxQ6d0Xqlo8mJ4rw449CqOCHxfARibJpDWkOS7aqkiRNUnaKzi4kI1lT3Qz384l0mYuNNyi8RN8ni92vPB/1EHAgoI9f+XR4XEF6VE14UEILg6zSDhNyskpCFouBtb+qKix1l3eRX/mc3JLNwEpgY8hqmGKyDgt0UbFrMHCbhcmcfIYGFLEjFJ3dc3CxLsNfewJNGdKWSAvNHwdqcVtoHAM8C+65a8lZ97tJgocRT8OTIGFiWW1/82hHP4aglAVnpKySi2pUHLXLUzS92nlSVkgKwCzOFIpzw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: BPfAD80ZGqjUGkxB68esHZgMMh9U4UV3J0reOYPCSpqCk51ccSVNcePEiOmQGedJ5qryZLt5Onw/uFho3saz3d4+gKp3RMx7X0J9FogetLNvdtj77lKQnLNvVSbqQnjTaGqBLZypMrfboM/Szbvxj8bgcAa4Zs0/7+2IuD3C/LN+lWdOqUIQnjbFf2dOiqSlq4WZqLXlmfHemPLmzmE/8iY6kDzHPZUgXpVk191hmdT1I/INEW8Ee9Tuz8H97PECyngKy6hhldCFyAb3lgQ344pV/HzWM1LKNRlcAnvct2qC84UqFQMYSaf8+jkJM6f/WwPre23/YKGv5ANGZLu3sbpMLKeZbPeO6URemXkH3Kwf/H4jNiQX8ASRuyNUbD9Gi0OMPMaXIZYQ4XocVkVzsBhbgZSUTJCFkO/3qOSDVZWxstooy/UtsDuSWb795wgCMqD37pglfcRbl4X7xrWM6iNj6wO98TvKMZmp4k5n3LrtNfLmc/eQRdyHE6bUv/HJQ/9nsi5rBmLGI1EohJJMiu+I5+pr+MGE2cozWmY4OroPEPJ0Nnee1JWEy+seLbHoMlO7r128raWBhNiNby0onHTG7iuy73a1mWdhL75C4+QO7iy5IdBB32j5cuYOsJCQpc8CzntMOopDrG0d+TAYsckW+SjHLHojs4V/JJ4GpYIFjvvIiWVzDAgq+dEzUXASS0W/qSz+TXqWE0YJKMTxeA== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 6f0e3789-859c-43df-e038-08d9b3694fab X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 18:51:53.8760 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0125 Subject: [FFmpeg-devel] [PATCH 4/5] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QpDN471kI+Ze Signed-off-by: softworkz --- libavcodec/qsvdec.c | 210 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 8bce9f2cf0..62f3e65455 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -45,6 +45,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 }; @@ -92,6 +98,8 @@ typedef struct QSVContext { mfxExtBuffer **ext_buffers; int nb_ext_buffers; + + Mpeg1Context mpeg_ctx; } QSVContext; static const AVCodecHWConfigInternal *const qsv_hw_configs[] = { @@ -498,6 +506,185 @@ static QSVFrame *find_frame(QSVContext *q, mfxFrameSurface1 *surf) return NULL; } +static int find_start_offset(mfxU8 data[1024]) +{ + 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 }; + mfxU8 data[1024] = { 0 }; + mfxPayload payload = { 0, .Data = &data[0], .BufSize = sizeof(data) }; + mfxU64 ts; + int ret; + + while (1) { + int start; + memset(&data[0], 0, sizeof(data)); + + 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 ret; + } + + if (payload.NumBit == 0 || payload.NumBit >= sizeof(data) * 8) { + break; + } + + start = find_start_offset(data); + + switch (payload.Type) { + case SEI_TYPE_BUFFERING_PERIOD: + case SEI_TYPE_PIC_TIMING: + continue; + } + + if (init_get_bits(&gb, &data[start], payload.NumBit - start * 8) < 0) + av_log(avctx, AV_LOG_ERROR, "Error initializing bitstream reader"); + else + 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); + 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, AVFrame* out) +{ + HEVCSEI sei = { 0 }; + HEVCParamSets ps = { 0 }; + GetBitContext gb = { 0 }; + mfxU8 data[1024] = { 0 }; + mfxPayload payload = { 0, .Data = &data[0], .BufSize = sizeof(data) }; + mfxU64 ts; + int ret; + + while (1) { + int start; + memset(&data[0], 0, sizeof(data)); + + 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 ret; + } + + if (payload.NumBit == 0 || payload.NumBit >= sizeof(data) * 8) { + break; + } + + start = find_start_offset(data); + + switch (payload.Type) { + case SEI_TYPE_BUFFERING_PERIOD: + case SEI_TYPE_PIC_TIMING: + continue; + case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: + case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: + // There seems to be a bug in MSDK for these + payload.NumBit -= 8; + break; + } + + if (init_get_bits(&gb, &data[start], payload.NumBit - start * 8) < 0) + av_log(avctx, AV_LOG_ERROR, "Error initializing bitstream reader"); + else + 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 (out) + return ff_set_side_data(avctx, &sei, NULL, out); + + return 0; +} + +static int parse_sei_mpeg12(AVCodecContext* avctx, QSVContext* q, AVFrame* out) +{ + Mpeg1Context *mpeg_ctx = &q->mpeg_ctx; + mfxU8 data[1024] = { 0 }; + mfxPayload payload = { 0, .Data = &data[0], .BufSize = sizeof(data) }; + mfxU64 ts; + int ret; + + while (1) { + int start; + + memset(&data[0], 0, sizeof(data)); + 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 ret; + } + + if (payload.NumBit == 0 || payload.NumBit >= sizeof(data) * 8) { + break; + } + + start = find_start_offset(data); + + start++; + + ff_mpeg_decode_user_data(avctx, mpeg_ctx, &data[start], (int)((payload.NumBit + 7) / 8) - start); + + 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 start %d -> %.s\n", payload.Type, payload.NumBit, start, (char *)(&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, const AVPacket *avpkt) @@ -535,6 +722,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) + parse_sei_mpeg12(avctx, q, NULL); } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_ERR_MORE_SURFACE); @@ -570,6 +759,27 @@ 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: + 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->frame); + break; + default: + ret = 0; + } + + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error parsing SEI data\n"); + av_freep(&sync); + return ret; + } +# out_frame->queued = 1; av_fifo_generic_write(q->async_fifo, &out_frame, sizeof(out_frame), NULL); av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL); From patchwork Mon Nov 29 18:51:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6577951iob; Mon, 29 Nov 2021 10:52:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8uajEkUgqoAa3PpXF936dB83gcoWeg+VzU9xI65EQEHAfkOgSBECZv340Kp4Kt/1u8G2n X-Received: by 2002:a50:fe8e:: with SMTP id d14mr78496580edt.51.1638211974862; Mon, 29 Nov 2021 10:52:54 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds11si34193869ejc.465.2021.11.29.10.52.54; Mon, 29 Nov 2021 10:52:54 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=oHGawVXg; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B6A068AD8B; Mon, 29 Nov 2021 20:52:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2036.outbound.protection.outlook.com [40.92.19.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A171568AC54 for ; Mon, 29 Nov 2021 20:52:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hGZKrvLE/wuGr4RuO6W2XEe3zdeKRoERDlDAe7xRF+VGxSWPuNMESiDNbbSmkUgDc/ssz7P6j3AyxqhKSobuvkepSAYjToS+VgL8isQ8Ipie6d+Dq0NJfgm3PvgDAvKYGntYKrxO2ah8W2sVqzNNVrm9aB9qvT9UVQ7CoguTUxldvoSp4qosq1wrunjqiEjgArcvSCjUqCfn6VGhYyquPHRXHxoyWroJYGHl91oqA7XEfkjEza2goR+RQiWLnAZpj2sgP+z0QroQeW/Z2dByfxqjscxtuDC/v6jLPnlcaPooknAeAyA4uNbbeb+JWPEWgMkoI+m4Jn41k9p2NyXpmQ== 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=BTjQeTHV4cgMrm7wvB44U9bcq5qtHzDXtIjO63eeYV4=; b=J5ROPXKV7A5orxy4zpM0dczKfpk1aqgiy17qTwSBa1NiCH20OwwEliWbmxYkI49y0AcLJjfgbBJgRJ5F7Ii5oV8IZFtnU5AcN1aie+UXxRn7OZJtgTeimu68sT7zUOxE6oIvcjN6VHg0tHIlbXQ/PVdSTb7bArr5950S845j0uTUBehfscqYLtnvQVJhukZhqfxa6ajTORQtrMpCW61yNQZqbjy1Cp7go9gvX4ueIZrmCl/4HHLtoPcUxdccVhHzPuzyUo4IbszUwXMLYnfy1EHCT+/717TNEicgYsfBcFepDfBPDkby6ZfEu9+l3pzPefPIIiZguGmQD5rtFWGMhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BTjQeTHV4cgMrm7wvB44U9bcq5qtHzDXtIjO63eeYV4=; b=oHGawVXgs3zJfQlg/HXRJ13gNDB6AGjOTdQwiz+bVToBC000x/NJ7Phk614YBk+Zc+vFYlfm5rD/oWYcL/LeDLU2zsRRsn1meSX7ayZeUo3e2hZbVUeENtDkaR2C+5nIphlvFZefAkGntIdmEd3WSRymVDLoddXl4zdBmpdVF3LWPFFgB0EiaMqj5CQNv6JSY2qPKXaD8wgKbODosxQGcKg1dn/WWl4LdshtGpBf1Ki3dMiJ5fdYjA0dzRAv3uA3isN6SGU6tEtypz/H71SdZNm1e93SB7Ag1qJWuB9LyLW2DvtGBGjB1GyOWbkE2VQcPDpeBUDXovMXxlcxZgBswg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0125.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 18:51:56 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 18:51:56 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 5/5] avcodec/qsvenc: Ensure payload array is initialized when using enc_ctrl Thread-Index: AQHX5VIul1eYTmqHu0elON/QOnDO5A== Date: Mon, 29 Nov 2021 18:51:56 +0000 Message-ID: References: <62b3a721e463650b46e527abcc9169ec1cc3e9f8.1638210102.git.softworkz@hotmail.com> <2362f84d0e53c691dbf248743c6640c91d83a491.1638210102.git.softworkz@hotmail.com> <5a3b242f9bedd7453a810eae1edf78918726d12c.1638210102.git.softworkz@hotmail.com> <65b666e63e9e2f53a526964e9eb4963df018c6f0.1638210102.git.softworkz@hotmail.com> In-Reply-To: <65b666e63e9e2f53a526964e9eb4963df018c6f0.1638210102.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [k7EGwmgY7o7Oz4sfIrDuaWnRsVSh8k4P] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 07a6333e-f3f3-4917-9236-08d9b3695166 x-ms-traffictypediagnostic: DM8P223MB0125: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +e0e9ZukZ7KUiKX89VON64LXJb7XOLMrKbgXkJ1BfjPNkxUT6VjaZIAT3bOcggTGppeskURtO2yaQgm3vYjh45NBQnzH18HNDCbRz4EC0kLPTNtg10jdOI/q9kZcjfmYRPHS5TpnD2oblg+jK/PFdeARUblsymeu/PrRml5ccHZ5vdvzdspHjgO7IpcxO6DHiIoygMtONoRV+EoNZmWOCB4K0BlLbPgQvm8P7ytxkS8KiWwpvTf2+lsyjlOPWtFjGHw+986aDnrWpfUiVMbqMngykpZrVXx1ztpw7zetrfapG7QWQsaBr0MmyM6FYqY2a0Y1BZXso17KmPXJBRTReWNjwlWl9JeTHSs2OC78wPUy6aVsrUCnmesz7J9nOxjz1dDPJ3mSy1OvLxbQS46T4dcoOdYlxps+48qAiQukGGLYsXGn8uaFoui2Gy6XSadt7PFVkcGtWFql8LreHG2j5qnwGVvJ27JNIWdh9quPMheN1u4lmjQgVySbthfhPLCTXB8jiOte1gfbCxA/SX4GnTmO+jGE4vxctgn8A93fYLld0dBC0lxh5J4MIEb2jo1kvoyIt4OCjjHQSIT/5rbdew== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: TbKRwYNqs6ltJ7udgLVBF7V9IimrkZwL/9rUmbT0jmSUSLTa/KSegjelqZpDeO1y9SDsLLFFtHPiWIVJh4g9E5m7VHquW+QajhIkL7d6E7rdB8KRd2I5dM3MxOui3AzQ2YqkHP1qwKrU+0QhXWQpZ5yWCMnpFBSnLEYgxOblC4gEqioU9FQa47a6VRthcHRtS59qg3gUEglcFO9iFfmkBXYM+icCLli3dUw2K7nqYhSrBzaoz0YFaMjiquCJNTebQNbIyNsMfQGoDJfLA2qZM7UZKFgGLjkFBREsarY3nXvwX5AOW0Q99Et6pBWzPFJnQwm6yjB0pguhVZwpr3nzVzyWTtXu8WX6ciWgt6taD+0Ro1JYnICfthVgcNr6Mosofq9KdQibK9Yzv+XQHpwNQyV/lzu7+muPENpy16T7NObKozwXThfeeqkk5ZzS1kEBbjt3pmVblz2xyL0Vh3b9YBUi+aWpD/2OjumAIT+HVUBPhMht0+j3mD2/tHkQ9hCbOB+dQvmuiPwyc+hzfcVkHpVnzaZJqNeU4+ZF0WcntvuZSxNlX/Qyp0RG+uEIKZfs1WJIGHRhi340nRHnhWMaKOF1kR36Eu/Um+N+Dp/8+r9zZNEnPbRIHft//Iq8MrDC7Z50beAdlsBCdDeuyhrCvGeOLdWfiBazgGBLRnJTUQir6qRQ9AEqr+i6dsQ/VOwyvE5MWhrdn3A3sjxGx7QK7w== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 07a6333e-f3f3-4917-9236-08d9b3695166 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 18:51:56.7951 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0125 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/qsvenc: Ensure payload array is initialized when using enc_ctrl 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: iajFbBYw9NWF Signed-off-by: softworkz --- libavcodec/qsvenc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 06f55604b5..2c3b22e5f7 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1477,7 +1477,16 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, } #endif - if (q->set_encode_ctrl_cb) { + if (q->set_encode_ctrl_cb && qsv_frame) { + + if (!qsv_frame->enc_ctrl.Payload) { + qsv_frame->enc_ctrl.Payload = av_mallocz(sizeof(mfxPayload*) * QSV_MAX_ENC_PAYLOAD); + if (!qsv_frame->enc_ctrl.Payload) { + av_freep(&frame); + return AVERROR(ENOMEM); + } + } + q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); }