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 B6303476A3 for ; Tue, 19 Sep 2023 19:57:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B82868C912; Tue, 19 Sep 2023 22:56:56 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2104.outbound.protection.outlook.com [40.92.89.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F1D268C7DD for ; Tue, 19 Sep 2023 22:56:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wm4yKd/ImgI6jxwyQSBj3GVjGvtG3G9udGLtfTIUBxEM+dRGjdARsOA72ISyTW+QLpf367zsVtS3bNweDA/CXqTtCbOoy2kU2TRvf2iUIj/ADmNOYdCAAot9n1z6eeA24tz6G+BvtReMIzlzdj2jdD8ReO7HBJ+9DXqsgQ9zarYJKlCEH/iOLPg3kxG07s5O2B1Dtg+G0Bdm9kF53aLk/eJgG19aCroiPWagfTCb9qDtLNcc+XFiAe+NSdoc7Y3ji/oPPBjqeSxome+/Iacj3Iy+qyIfKoW4huqXO3v+HenYM5Ld3nAyLE9V9EagwYrVNJ9JRJkDc9jno7zFwaQesA== 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=46TLRMrCcaaRQVQ0h1w3s45uYKeKl01q9bMvTOk0pDU=; b=C7g4I3OpcQDR9wIMPaQB8EFKKAgXkZg5hyCDmeFiDupsmHWxuNACswTizreQ91/8gdeunPuwy+Pak3O577SJClZLrAYhWa5gvpys8HDrOvAwbdEfy0ggbC7kq3F+PiR5B5PaGUhsTy4YUvbuF5T6l/IjXImkGaX2wcGspd/5ySDDmYKHo0EDSmS51YmWG39v1QLoPB9po/s63IIh6aPyjmcdRucb8UE4+Nc0OGRqKEpI8P9qcFhFYWhOz4LuN0wDoWTlHKzHaaqg9mAQ1MWaiU8MTnqA0fG6erdkxx5memY1E1ufcdIXu5lgDM62B2MLdqGi25a5sRE0VEmo8XONLA== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=46TLRMrCcaaRQVQ0h1w3s45uYKeKl01q9bMvTOk0pDU=; b=hg0Bga4YzyUgcBMKGsscPZPiDQA20Sl9KbzwTVAsuWQrMfHU5InAMahgDzqlZt/lkIs4EOwZA4q6dEb+Ta6c53qC6e85P1y6ngnsEql3LWmhH9VcsA3TxNDftfUDqMlOdS4nL/7dOGNM1wqctvO4+kdMUNc9l1dT9CHF6ZAEc/rHhEa6WOutcLbRjpYkLyJ2vCnBs9SqkSQJ11BPGiG2ZURLYIsiouyjy4m41SclXotFQixGJM4B7BJ4YylCRFQx3rpG5sTfQL1rwa90gCLnqVY+3qj3iewJDZFmhycCODx4Di0fY1eortiOdR6JKfuKxDKqw85gEnsoLWgPWilMaA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0215.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep 2023 19:56:53 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 19:56:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:56:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [TjPRHSEoIwqPUY3FcvD5nHnKYSgrTbdk] X-ClientProxiedBy: ZR0P278CA0086.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230919195734.1005750-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0215:EE_ X-MS-Office365-Filtering-Correlation-Id: f5052b7c-639a-4988-f00d-08dbb94a91df X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ss5UdQzMz2EOJkPmkSiS4o0e2objQR+I+9FH5C52c5qpik1nH4JjXyGpRr4Nfwz2no2vD2AYs9qdYnea4yNgmz0LixfLmeVp5Fj8cAhB50revabsnhad4pjVQMh7nCfmUN8I8ydRCFvgWHpKRo54FhdWKNqbn4szgQthyT9NX6KasKu3+srmSaK3ZYXdws8TJKuNnKyz0Qosckr+AppQxPEQhSlntiBiIfOZgMaUS/kKClSbEVxN+7lbNGw08wbBvNsZZPz00xFhNtMlnmnVhW10WBMQRDC+yteo+AweJsMFK/1+LmBkzZCnDZUOQ8EkMDfd4y9Ws+HVi9lefrju1tnpkwDEyaTvn9GQ/riY4cXJmzB10L5OUjmbpDTeIR3s4xR4pEm5m7q3JKKX8ILuqWkaOhGZGuVZQC2jlx1HmmnWx3nvnm0+uMOBmlL8Jzi6yg+IpIMXwiRIFpeC8MPAFt3IS/9bh91UwHKf3F8Ww9ggYfwdx9xy/ZRVQm1Pl1hljw8xdewRDvi2XjpGJDVNPBN9DLxzPicWPypYIpNluPk0xwZ3hDmI1BdyuegQXYwTBIT+eMqvuhDdHdefupaH1im4Sj+Tj85AAlnSS40zo6k= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FxexoGT27k05w7/5hPCy/aV1ay/wN/Tbju74Cbz7NBr40x74AvldZAUPKn6d?= =?us-ascii?Q?I29CM3/KZzW2rtHIR6o3SJR/PRLqlm/3PXxmbSx0j6QjxTB1A7strCdAEjvF?= =?us-ascii?Q?4KoGNi06+QQ4+njyoUU66UwLD5VIdjKHbk/3ooXv7/PsZ5IKJo+rOMcTAk3M?= =?us-ascii?Q?1K52zZj7b7rRWGmtXRMb/Ho68AYCrnVgtE7vUHTxFXRYuphsPB5NBaCVZ+R7?= =?us-ascii?Q?gymEVICibPQqSUJDdW5a1yKrCKa9eV+nQqdJRK8EoB5n4pde/0Cgc2+9IpLi?= =?us-ascii?Q?TAgM8va8lrtHdRuOZ5zvJ484ZJwL6tbY4ndJnm/PtwV0Y9WULr1MnRDraTEa?= =?us-ascii?Q?oxHJkVvUA8xhwXtBMQMdVu8N5UbvaE/jlOhdzwJbJq0hOiQTM6BxVDQ3N2B2?= =?us-ascii?Q?J7JOkkGt2yF/vsi5vFuN1QuzgtRY8/WMzu99+PIofyIOVQmLXcr63N8AB+XS?= =?us-ascii?Q?he6QHXAM+QrS2whqpO1eWERWG7tyLjXkMsYXQCxQrS9gM1FXP/K5VcUH8NBY?= =?us-ascii?Q?eIN4JL8ep+Gf5e+BjJTsMb0A88cOTcErTbg3gZDYh9KlU4JtsMugbXcGYKuE?= =?us-ascii?Q?MjDhV13RJcOdvbtwf4uH1H4bn9pw0iX4GSnB+j5JJwDk5SHlwL8pC965z9fG?= =?us-ascii?Q?KW7NnONdzU/Xa85wY/RT6zOElzyAlBQmJPZb4tj6OkUtzv+GAAv6IHlCHjk5?= =?us-ascii?Q?rkiKDgx9GoDe1d3gq7xAVqnkTKeUQmjPWNbCZBqe/2K/ywcIkR/mFKmX7r9z?= =?us-ascii?Q?SHyGROFDPInlhZdxBgugALQ3HLvTdcakdAZGP4CIrDyvxTT+KledjlpSQSdu?= =?us-ascii?Q?qCB1iuJEV+WSNRS8navKIoR4gU6IDVwsT737/NoEYobWFaAU9yLCMg6aLyCH?= =?us-ascii?Q?8smd7sQcelUUxNJ5PJeMcLfpvWR0MXXPY7eU3vId3OUhTSUEShF9SgFf/ual?= =?us-ascii?Q?URvd74tCLIYR2fBqQtcCqNCpkqQqH0fXu60x6YxM3BeVj94UAmuKhf0XGWY7?= =?us-ascii?Q?X9RZykVpXPZVeJVx8iEYoy5/mHKj04h5ny4fBtz9BVoZR+y+UQkxR8zaGXlh?= =?us-ascii?Q?ZmrCkdTF/NFhfgkqptaRocl/ZMX+cW4oIOiupsYQIMmzAIhxZFHWpiS3vADs?= =?us-ascii?Q?rzxLxkNCiNGA14cQeQqr/E/yo1Kj2ZVEt02FvJ9ggW8cTdO0QkjV941XOpPT?= =?us-ascii?Q?/OF8hWIliNk7UwLoieeY1Fl4xd8jRoC99vK97exkpOL/R/3UqBENTu2NWgOW?= =?us-ascii?Q?H+ai6gMmaFAUznt4S6n5?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5052b7c-639a-4988-f00d-08dbb94a91df X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 19:56:53.1839 (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: AM8P250MB0215 Subject: [FFmpeg-devel] [PATCH 05/42] avcodec/hevc_ps: Use RefStruct API for parameter sets 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: Andreas Rheinhardt 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: Avoids allocations and error checks for these allocations; e.g. syncing buffers across threads can't fail any more and needn't be checked. It also gets rid of casts and indirections. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevc_parser.c | 8 ++-- libavcodec/hevc_ps.c | 80 ++++++++++++++++---------------------- libavcodec/hevc_ps.h | 10 ++--- libavcodec/hevc_sei.c | 5 +-- libavcodec/hevcdec.c | 36 +++++++---------- libavcodec/mediacodecdec.c | 6 +-- libavcodec/videotoolbox.c | 4 +- libavcodec/vulkan_hevc.c | 16 ++++---- 8 files changed, 72 insertions(+), 93 deletions(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 59f9a0ff3e..87270cffb4 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -77,15 +77,15 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal, av_log(avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", pps_id); return AVERROR_INVALIDDATA; } - ps->pps = (HEVCPPS*)ps->pps_list[pps_id]->data; + ps->pps = ps->pps_list[pps_id]; if (ps->pps->sps_id >= HEVC_MAX_SPS_COUNT || !ps->sps_list[ps->pps->sps_id]) { av_log(avctx, AV_LOG_ERROR, "SPS id out of range: %d\n", ps->pps->sps_id); return AVERROR_INVALIDDATA; } - if (ps->sps != (HEVCSPS*)ps->sps_list[ps->pps->sps_id]->data) { - ps->sps = (HEVCSPS*)ps->sps_list[ps->pps->sps_id]->data; - ps->vps = (HEVCVPS*)ps->vps_list[ps->sps->vps_id]->data; + if (ps->sps != ps->sps_list[ps->pps->sps_id]) { + ps->sps = ps->sps_list[ps->pps->sps_id]; + ps->vps = ps->vps_list[ps->sps->vps_id]; } ow = &ps->sps->output_window; diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 7507d2bf9c..a6b64b92e3 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -28,6 +28,7 @@ #include "h2645_vui.h" #include "hevc_data.h" #include "hevc_ps.h" +#include "refstruct.h" static const uint8_t default_scaling_list_intra[] = { 16, 16, 16, 16, 17, 18, 21, 24, @@ -61,40 +62,40 @@ static const uint8_t hevc_sub_height_c[] = { static void remove_pps(HEVCParamSets *s, int id) { - if (s->pps_list[id] && s->pps == (const HEVCPPS*)s->pps_list[id]->data) + if (s->pps == s->pps_list[id]) s->pps = NULL; - av_buffer_unref(&s->pps_list[id]); + ff_refstruct_unref(&s->pps_list[id]); } static void remove_sps(HEVCParamSets *s, int id) { int i; if (s->sps_list[id]) { - if (s->sps == (const HEVCSPS*)s->sps_list[id]->data) + if (s->sps == s->sps_list[id]) s->sps = NULL; /* drop all PPS that depend on this SPS */ for (i = 0; i < FF_ARRAY_ELEMS(s->pps_list); i++) - if (s->pps_list[i] && ((HEVCPPS*)s->pps_list[i]->data)->sps_id == id) + if (s->pps_list[i] && s->pps_list[i]->sps_id == id) remove_pps(s, i); - av_assert0(!(s->sps_list[id] && s->sps == (HEVCSPS*)s->sps_list[id]->data)); + av_assert0(!(s->sps_list[id] && s->sps == s->sps_list[id])); + ff_refstruct_unref(&s->sps_list[id]); } - av_buffer_unref(&s->sps_list[id]); } static void remove_vps(HEVCParamSets *s, int id) { int i; if (s->vps_list[id]) { - if (s->vps == (const HEVCVPS*)s->vps_list[id]->data) + if (s->vps == s->vps_list[id]) s->vps = NULL; for (i = 0; i < FF_ARRAY_ELEMS(s->sps_list); i++) - if (s->sps_list[i] && ((HEVCSPS*)s->sps_list[i]->data)->vps_id == id) + if (s->sps_list[i] && s->sps_list[i]->vps_id == id) remove_sps(s, i); + ff_refstruct_unref(&s->vps_list[id]); } - av_buffer_unref(&s->vps_list[id]); } int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, @@ -442,12 +443,10 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, int i,j; int vps_id = 0; ptrdiff_t nal_size; - HEVCVPS *vps; - AVBufferRef *vps_buf = av_buffer_allocz(sizeof(*vps)); + HEVCVPS *vps = ff_refstruct_allocz(sizeof(*vps)); - if (!vps_buf) + if (!vps) return AVERROR(ENOMEM); - vps = (HEVCVPS*)vps_buf->data; av_log(avctx, AV_LOG_DEBUG, "Decoding VPS\n"); @@ -553,17 +552,17 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, } if (ps->vps_list[vps_id] && - !memcmp(ps->vps_list[vps_id]->data, vps_buf->data, vps_buf->size)) { - av_buffer_unref(&vps_buf); + !memcmp(ps->vps_list[vps_id], vps, sizeof(*vps))) { + ff_refstruct_unref(&vps); } else { remove_vps(ps, vps_id); - ps->vps_list[vps_id] = vps_buf; + ps->vps_list[vps_id] = vps; } return 0; err: - av_buffer_unref(&vps_buf); + ff_refstruct_unref(&vps); return AVERROR_INVALIDDATA; } @@ -851,7 +850,8 @@ static int map_pixel_format(AVCodecContext *avctx, HEVCSPS *sps) } int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, - int apply_defdispwin, AVBufferRef **vps_list, AVCodecContext *avctx) + int apply_defdispwin, const HEVCVPS * const *vps_list, + AVCodecContext *avctx) { HEVCWindow *ow; int ret = 0; @@ -1269,15 +1269,13 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps, int apply_defdispwin) { - HEVCSPS *sps; - AVBufferRef *sps_buf = av_buffer_allocz(sizeof(*sps)); + HEVCSPS *sps = ff_refstruct_allocz(sizeof(*sps)); unsigned int sps_id; int ret; ptrdiff_t nal_size; - if (!sps_buf) + if (!sps) return AVERROR(ENOMEM); - sps = (HEVCSPS*)sps_buf->data; av_log(avctx, AV_LOG_DEBUG, "Decoding SPS\n"); @@ -1296,7 +1294,7 @@ int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, apply_defdispwin, ps->vps_list, avctx); if (ret < 0) { - av_buffer_unref(&sps_buf); + ff_refstruct_unref(&sps); return ret; } @@ -1314,19 +1312,19 @@ int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, * original one. * otherwise drop all PPSes that depend on it */ if (ps->sps_list[sps_id] && - !memcmp(ps->sps_list[sps_id]->data, sps_buf->data, sps_buf->size)) { - av_buffer_unref(&sps_buf); + !memcmp(ps->sps_list[sps_id], sps, sizeof(*sps))) { + ff_refstruct_unref(&sps); } else { remove_sps(ps, sps_id); - ps->sps_list[sps_id] = sps_buf; + ps->sps_list[sps_id] = sps; } return 0; } -static void hevc_pps_free(void *opaque, uint8_t *data) +static void hevc_pps_free(FFRefStructOpaque unused, void *obj) { - HEVCPPS *pps = (HEVCPPS*)data; + HEVCPPS *pps = obj; av_freep(&pps->column_width); av_freep(&pps->row_height); @@ -1338,8 +1336,6 @@ static void hevc_pps_free(void *opaque, uint8_t *data) av_freep(&pps->tile_pos_rs); av_freep(&pps->tile_id); av_freep(&pps->min_tb_addr_zs_tab); - - av_freep(&pps); } static void colour_mapping_octants(GetBitContext *gb, HEVCPPS *pps, int inp_depth, @@ -1742,19 +1738,11 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, ptrdiff_t nal_size; unsigned log2_parallel_merge_level_minus2; - AVBufferRef *pps_buf; - HEVCPPS *pps = av_mallocz(sizeof(*pps)); + HEVCPPS *pps = ff_refstruct_alloc_ext(sizeof(*pps), 0, NULL, hevc_pps_free); if (!pps) return AVERROR(ENOMEM); - pps_buf = av_buffer_create((uint8_t *)pps, sizeof(*pps), - hevc_pps_free, NULL, 0); - if (!pps_buf) { - av_freep(&pps); - return AVERROR(ENOMEM); - } - av_log(avctx, AV_LOG_DEBUG, "Decoding PPS\n"); nal_size = gb->buffer_end - gb->buffer; @@ -1796,8 +1784,8 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, ret = AVERROR_INVALIDDATA; goto err; } - sps = (HEVCSPS *)ps->sps_list[pps->sps_id]->data; - vps = (HEVCVPS *)ps->vps_list[sps->vps_id]->data; + sps = ps->sps_list[pps->sps_id]; + vps = ps->vps_list[sps->vps_id]; pps->dependent_slice_segments_enabled_flag = get_bits1(gb); pps->output_flag_present_flag = get_bits1(gb); @@ -1998,12 +1986,12 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, } remove_pps(ps, pps_id); - ps->pps_list[pps_id] = pps_buf; + ps->pps_list[pps_id] = pps; return 0; err: - av_buffer_unref(&pps_buf); + ff_refstruct_unref(&pps); return ret; } @@ -2012,11 +2000,11 @@ void ff_hevc_ps_uninit(HEVCParamSets *ps) int i; for (i = 0; i < FF_ARRAY_ELEMS(ps->vps_list); i++) - av_buffer_unref(&ps->vps_list[i]); + ff_refstruct_unref(&ps->vps_list[i]); for (i = 0; i < FF_ARRAY_ELEMS(ps->sps_list); i++) - av_buffer_unref(&ps->sps_list[i]); + ff_refstruct_unref(&ps->sps_list[i]); for (i = 0; i < FF_ARRAY_ELEMS(ps->pps_list); i++) - av_buffer_unref(&ps->pps_list[i]); + ff_refstruct_unref(&ps->pps_list[i]); ps->sps = NULL; ps->pps = NULL; diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index ef11e51ee7..786c896709 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -23,7 +23,6 @@ #include -#include "libavutil/buffer.h" #include "libavutil/pixfmt.h" #include "libavutil/rational.h" @@ -437,9 +436,9 @@ typedef struct HEVCPPS { } HEVCPPS; typedef struct HEVCParamSets { - AVBufferRef *vps_list[HEVC_MAX_VPS_COUNT]; - AVBufferRef *sps_list[HEVC_MAX_SPS_COUNT]; - AVBufferRef *pps_list[HEVC_MAX_PPS_COUNT]; + const HEVCVPS *vps_list[HEVC_MAX_VPS_COUNT]; ///< RefStruct references + const HEVCSPS *sps_list[HEVC_MAX_SPS_COUNT]; ///< RefStruct references + const HEVCPPS *pps_list[HEVC_MAX_PPS_COUNT]; ///< RefStruct references /* currently active parameter sets */ const HEVCVPS *vps; @@ -457,7 +456,8 @@ typedef struct HEVCParamSets { * to an existing VPS */ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, - int apply_defdispwin, AVBufferRef **vps_list, AVCodecContext *avctx); + int apply_defdispwin, const HEVCVPS * const *vps_list, + AVCodecContext *avctx); int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps); diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 351e699726..abdb52acd3 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -53,11 +53,10 @@ static int decode_nal_sei_pic_timing(HEVCSEI *s, GetBitContext *gb, const HEVCParamSets *ps, void *logctx) { HEVCSEIPictureTiming *h = &s->picture_timing; - HEVCSPS *sps; + const HEVCSPS *sps = ps->sps_list[s->active_seq_parameter_set_id]; - if (!ps->sps_list[s->active_seq_parameter_set_id]) + if (!sps) return(AVERROR(ENOMEM)); - sps = (HEVCSPS*)ps->sps_list[s->active_seq_parameter_set_id]->data; if (sps->vui.frame_field_info_present_flag) { int pic_struct = get_bits(gb, 4); diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 81b9c5e089..d64055e1f9 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -50,6 +50,7 @@ #include "hwconfig.h" #include "internal.h" #include "profiles.h" +#include "refstruct.h" #include "thread.h" #include "threadframe.h" @@ -326,7 +327,7 @@ static void export_stream_params(HEVCContext *s, const HEVCSPS *sps) { AVCodecContext *avctx = s->avctx; const HEVCParamSets *ps = &s->ps; - const HEVCVPS *vps = (const HEVCVPS*)ps->vps_list[sps->vps_id]->data; + const HEVCVPS *vps = ps->vps_list[sps->vps_id]; const HEVCWindow *ow = &sps->output_window; unsigned int num = 0, den = 0; @@ -573,7 +574,7 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, } s->ps.sps = sps; - s->ps.vps = (HEVCVPS*) s->ps.vps_list[s->ps.sps->vps_id]->data; + s->ps.vps = s->ps.vps_list[s->ps.sps->vps_id]; return 0; @@ -616,16 +617,16 @@ static int hls_slice_header(HEVCContext *s) return AVERROR_INVALIDDATA; } if (!sh->first_slice_in_pic_flag && - s->ps.pps != (HEVCPPS*)s->ps.pps_list[sh->pps_id]->data) { + s->ps.pps != s->ps.pps_list[sh->pps_id]) { av_log(s->avctx, AV_LOG_ERROR, "PPS changed between slices.\n"); return AVERROR_INVALIDDATA; } - s->ps.pps = (HEVCPPS*)s->ps.pps_list[sh->pps_id]->data; + s->ps.pps = s->ps.pps_list[sh->pps_id]; if (s->nal_unit_type == HEVC_NAL_CRA_NUT && s->last_eos == 1) sh->no_output_of_prior_pics_flag = 1; - if (s->ps.sps != (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data) { - const HEVCSPS *sps = (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data; + if (s->ps.sps != s->ps.sps_list[s->ps.pps->sps_id]) { + const HEVCSPS *sps = s->ps.sps_list[s->ps.pps->sps_id]; enum AVPixelFormat pix_fmt; ff_hevc_clear_refs(s); @@ -3301,7 +3302,7 @@ static int hevc_decode_extradata(HEVCContext *s, uint8_t *buf, int length, int f /* export stream parameters from the first SPS */ for (i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) { if (first && s->ps.sps_list[i]) { - const HEVCSPS *sps = (const HEVCSPS*)s->ps.sps_list[i]->data; + const HEVCSPS *sps = s->ps.sps_list[i]; export_stream_params(s, sps); break; } @@ -3539,23 +3540,14 @@ static int hevc_update_thread_context(AVCodecContext *dst, if (s->ps.sps != s0->ps.sps) s->ps.sps = NULL; - for (i = 0; i < FF_ARRAY_ELEMS(s->ps.vps_list); i++) { - ret = av_buffer_replace(&s->ps.vps_list[i], s0->ps.vps_list[i]); - if (ret < 0) - return ret; - } + for (int i = 0; i < FF_ARRAY_ELEMS(s->ps.vps_list); i++) + ff_refstruct_replace(&s->ps.vps_list[i], s0->ps.vps_list[i]); - for (i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) { - ret = av_buffer_replace(&s->ps.sps_list[i], s0->ps.sps_list[i]); - if (ret < 0) - return ret; - } + for (int i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) + ff_refstruct_replace(&s->ps.sps_list[i], s0->ps.sps_list[i]); - for (i = 0; i < FF_ARRAY_ELEMS(s->ps.pps_list); i++) { - ret = av_buffer_replace(&s->ps.pps_list[i], s0->ps.pps_list[i]); - if (ret < 0) - return ret; - } + for (int i = 0; i < FF_ARRAY_ELEMS(s->ps.pps_list); i++) + ff_refstruct_replace(&s->ps.pps_list[i], s0->ps.pps_list[i]); if (s->ps.sps != s0->ps.sps) if ((ret = set_sps(s, s0->ps.sps, src->pix_fmt)) < 0) diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 52b3a2c1f7..b8587289a2 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -223,21 +223,21 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) for (i = 0; i < HEVC_MAX_VPS_COUNT; i++) { if (ps.vps_list[i]) { - vps = (const HEVCVPS*)ps.vps_list[i]->data; + vps = ps.vps_list[i]; break; } } for (i = 0; i < HEVC_MAX_PPS_COUNT; i++) { if (ps.pps_list[i]) { - pps = (const HEVCPPS*)ps.pps_list[i]->data; + pps = ps.pps_list[i]; break; } } if (pps) { if (ps.sps_list[pps->sps_id]) { - sps = (const HEVCSPS*)ps.sps_list[pps->sps_id]->data; + sps = ps.sps_list[pps->sps_id]; } } diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 963379d483..43fd2e3fea 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -246,7 +246,7 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) #define COUNT_SIZE_PS(T, t) \ for (i = 0; i < HEVC_MAX_##T##PS_COUNT; i++) { \ if (h->ps.t##ps_list[i]) { \ - const HEVC##T##PS *lps = (const HEVC##T##PS *)h->ps.t##ps_list[i]->data; \ + const HEVC##T##PS *lps = h->ps.t##ps_list[i]; \ vt_extradata_size += 2 + escape_ps(NULL, lps->data, lps->data_size); \ num_##t##ps++; \ } \ @@ -369,7 +369,7 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) p += 3; \ for (i = 0; i < HEVC_MAX_##T##PS_COUNT; i++) { \ if (h->ps.t##ps_list[i]) { \ - const HEVC##T##PS *lps = (const HEVC##T##PS *)h->ps.t##ps_list[i]->data; \ + const HEVC##T##PS *lps = h->ps.t##ps_list[i]; \ int size = escape_ps(p + 2, lps->data, lps->data_size); \ /* unsigned int(16) nalUnitLength; */ \ AV_WB16(p, size); \ diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c index 52f223ceb2..395cbd3008 100644 --- a/libavcodec/vulkan_hevc.c +++ b/libavcodec/vulkan_hevc.c @@ -70,14 +70,14 @@ typedef struct HEVCHeaderSet { static int alloc_hevc_header_structs(FFVulkanDecodeContext *s, int nb_vps, - AVBufferRef * const vps_list[HEVC_MAX_VPS_COUNT]) + const HEVCVPS * const vps_list[HEVC_MAX_VPS_COUNT]) { uint8_t *data_ptr; HEVCHeaderSet *hdr; size_t buf_size = sizeof(HEVCHeaderSet) + nb_vps*sizeof(HEVCHeaderVPS); for (int i = 0; i < nb_vps; i++) { - const HEVCVPS *vps = (const HEVCVPS *)vps_list[i]->data; + const HEVCVPS *vps = vps_list[i]; buf_size += sizeof(HEVCHeaderVPSSet)*vps->vps_num_hrd_parameters; } @@ -96,7 +96,7 @@ static int alloc_hevc_header_structs(FFVulkanDecodeContext *s, hdr->hvps = (HEVCHeaderVPS *)(data_ptr + sizeof(HEVCHeaderSet)); data_ptr += sizeof(HEVCHeaderSet) + nb_vps*sizeof(HEVCHeaderVPS); for (int i = 0; i < nb_vps; i++) { - const HEVCVPS *vps = (const HEVCVPS *)vps_list[i]->data; + const HEVCVPS *vps = vps_list[i]; hdr->hvps[i].sls = (HEVCHeaderVPSSet *)data_ptr; data_ptr += sizeof(HEVCHeaderVPSSet)*vps->vps_num_hrd_parameters; } @@ -673,7 +673,7 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf) /* SPS list */ for (int i = 0; h->ps.sps_list[i]; i++) { - const HEVCSPS *sps_l = (const HEVCSPS *)h->ps.sps_list[i]->data; + const HEVCSPS *sps_l = h->ps.sps_list[i]; set_sps(sps_l, i, &hdr->hsps[i].scaling, &hdr->hsps[i].vui_header, &hdr->hsps[i].vui, &hdr->sps[i], hdr->hsps[i].nal_hdr, hdr->hsps[i].vcl_hdr, &hdr->hsps[i].ptl, &hdr->hsps[i].dpbm, @@ -683,15 +683,15 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf) /* PPS list */ for (int i = 0; h->ps.pps_list[i]; i++) { - const HEVCPPS *pps_l = (const HEVCPPS *)h->ps.pps_list[i]->data; - const HEVCSPS *sps_l = (const HEVCSPS *)h->ps.sps_list[pps_l->sps_id]->data; + const HEVCPPS *pps_l = h->ps.pps_list[i]; + const HEVCSPS *sps_l = h->ps.sps_list[pps_l->sps_id]; set_pps(pps_l, sps_l, &hdr->hpps[i].scaling, &hdr->pps[i], &hdr->hpps[i].pal); h265_params_info.stdPPSCount++; } /* VPS list */ for (int i = 0; i < nb_vps; i++) { - const HEVCVPS *vps_l = (const HEVCVPS *)h->ps.vps_list[i]->data; + const HEVCVPS *vps_l = h->ps.vps_list[i]; set_vps(vps_l, &hdr->vps[i], &hdr->hvps[i].ptl, &hdr->hvps[i].dpbm, hdr->hvps[i].hdr, hdr->hvps[i].sls); h265_params_info.stdVPSCount++; @@ -871,7 +871,7 @@ static int vk_hevc_end_frame(AVCodecContext *avctx) if (!pps) { unsigned int pps_id = h->sh.pps_id; if (pps_id < HEVC_MAX_PPS_COUNT && h->ps.pps_list[pps_id] != NULL) - pps = (const HEVCPPS *)h->ps.pps_list[pps_id]->data; + pps = h->ps.pps_list[pps_id]; } if (!pps) { -- 2.34.1 _______________________________________________ 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".