From patchwork Mon Jan 24 14:45:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp386975ioh; Mon, 24 Jan 2022 06:48:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcv8rA7w9hOr2yu4OfP0kCLnucFIT/vqvMwKzeRiV2XE+dZD5lNqkQdTJmuLv0XKWav3u9 X-Received: by 2002:a05:6402:1d4d:: with SMTP id dz13mr16248819edb.80.1643035702760; Mon, 24 Jan 2022 06:48:22 -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 x1si2476549edd.507.2022.01.24.06.48.22; Mon, 24 Jan 2022 06:48:22 -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=@outlook.com header.s=selector1 header.b=lvV5REGM; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0ABD68B0D0; Mon, 24 Jan 2022 16:47:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2070.outbound.protection.outlook.com [40.92.89.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 272D568B09D for ; Mon, 24 Jan 2022 16:47:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nPI1cLy+BjnnkUQ1QqnqGieizlZQLvm1wEBfLZLmfDYhswY0hk6aPSb/QtFp1IjvVPZ9U94P6djHCXZC1CYdO8aLwA1Bf90P9Tc1tUQuL3OfVxS18lQJ3DKDY9A7mMSZ/5Mo747UCbF9Z4fx121xjmz0a+CII3+FY/Dw8TcK2AXPotzqITZ3ojU2DbedxI+WrmKOkV8G6IfrA13zftBFerc1akfVkbrjCEMAxtt9N29nbQsJcML0HJjl8E1ImriQwQWITWhZoXWNqljj4fXtpddcIlU+Bppo5Q+vayBYXYqjhPBgkOM6lpLgtB7aab56hGFd9lUXO9Fjay9a7FvIyg== 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=7T9Cya222mdFJpam5ZEdSrtRGPdpuSrzNQmCK65vPxw=; b=QJ2RKVCbQrF17rVACc5jZ84Oei/827Uymy0DtPYo9u8RizJo3SLhDZFmp652uBLd0AwVVMsr+/XyfwdrO4tju7R4eaSxupTHfOTeQuq/YkR/9GMRzTGYCrfcQqGmRsRqOOiXvR8lzxgIHWhvffgLqT5YwErB5rxtysIxwAPvX631NT9Quq5bF2PT0hqMPt3pefP7ipv7CT/i6C0ztl+GxDmb9zJL2wduw30KVrwVtZpBFMnR9YaAPn8Z0IBJoJK9VXzitTqz4vtBS911Z3fKBHBXHOIg60n8kST/I3qkzXlVyqL0xgNJUu2TVORvTOiuU1GdCUL5dUGLZAyBkLPngw== 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=7T9Cya222mdFJpam5ZEdSrtRGPdpuSrzNQmCK65vPxw=; b=lvV5REGMWaf0KbifjidBtbYJlQE4383C4go3pBBxEhPrYq4iVICVwWqBoTsVfL7rNbgFXwVV0P6QfttHNweLoUlx7Hrqog9V9ngapC6x8jH+IYSxxyVeTGC950dSq99WVhMZ+jofa5wHeog258kYXXok8+37q1mmqAdk3YTV6/m0gii/txruY7VwqjyFy3KU/IPpjuLrHe7m8QKpkfoGjMMBZ7bVJYqU9r/+MmdQjC646mNAUQPdUGbdT6/dJ26yg4L2ffx+6vzCh9Pc1J92ZdycOnCNDwPPqptTGIHpY+k7oIDBgn/39jkzJPcyzae9JroSrcAxDVDROVxEa8u7GA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3088.eurprd03.prod.outlook.com (2603:10a6:802:2f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 14:47:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 14:47:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:45:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [h492sMu8g0A4f7AgvjxFPrPftt+xmZev] X-ClientProxiedBy: AM5PR0201CA0016.eurprd02.prod.outlook.com (2603:10a6:203:3d::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124144616.559446-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 586d039f-57ba-476f-69c4-08d9df48655a X-MS-TrafficTypeDiagnostic: VI1PR03MB3088:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qyxNDgCINFwvB2cEqgRHSLXNhkOLgVZJljBzwjA82EeWDTkWk4hyq2FwjkPN6Q845qRBYKN+L429RiPEsMp+v3WNwjhrzKGu6ZlV+8fBcYxgA3F5UWoa5trFZ2eej+KSPhV4/9D9rp5OiPmcf+b17VA6Z0lC+uvl3Mn60AOWcWY0aAWuR4QuiD6i+6qFIX+6Z3gpxdRjr6CUIMQ/Ihn7D3WIGf+C/WF6ZeN8I+eXh7q/hGXnYkUzjs5YZTlgaOfHGI/5F9TaivIPTeft4r146tJiFwhabyuw+ybw/rv9S2Sffk9vnRO9TDY5SJWiAQ86oDvfZefPSoB98P7dHnsAOlWA27IAgcamrct+b99Wp2t595POxj60gPWc5TFlDvrDLTm+9Pys1u05gHOcE6qYMY6ZY/0WRMee5CWJnqUPuE/BOBqq7Z4ohXESNVHr3ft1AwE1lB+x1/RYfNKRATewAQ7RNa8bNqpqYNg/8diV4nUfY89jaloXOfNnlKFlaYdpAmSSboQ+eRhc7E+wkpQNrK/trrpVjPO1vX5pomopguKzUIGi0yTqESSmtvbPem5A8c1fMaS45DkExUFHLyMOgA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FtBsE/ExgKBUuLiZT4Lv+j3sSazHryO3l9++Exaid57tw545TmV/w3bEJusZ22Pf5OXnKQOsf1FGwau5ZVAz+jq+TKIZa4Zp8HLGz8VQ61VOA86nKAf4Dhwgsv+IUdjhtu3JspEMgEjRx/9kLqu9bj2Sn1zyGxQcnQiTVH3EaeiDNLHUGzjXKo0HxhXx6pDorjAtgflKzYZYhIbk6IK+wyrOCSXXuhWiTfZzY0zjHbgGlwHZf+ccm+8PfF9JYnV/DzDeTVq/dAfamVQ2HmyzQBbHBxSmQeA2MfNAcf4E8Y07xsvys7zDIn3PJHiJobJn6k1DT/goXA8GbwRZMLea5s+8MbFB3i58ypeowkH4+2zzIU9pSTI2ghkx/xICm8dElHv+WbO0rNdUWzFld/vGtKXibUICq7nvv6e9XpWkUDO+JGSIU8mxWjrSGG8l2gJedlyLOQYrOj1KA862n3pEW4To0qBtNSWkRk7ywf1GCAg1WYPCsec7nw0BhC7Aw/1jCvNuLLQgRPwKeF44H9EQAgH4HgaNIQCRV/Kjb3MUrWpE17dxLywRBGQWfZZTQ4FRIBkdPkTdXBNcz76VWGKy0Wti831Ar84HAPYdpb2HJm0QGLBhkGpCrvk3KFtvBtecIuIpcO5mC8nEE+1ufxPbtj4DSP7kKWFyq3lQ4N49Ms8cVffQ/UN1OvcJl4tQ4dXJqTBnllPWojLEuN74GxZ9y6y0lfAVisFNjmLJPxbb6nQujXnqHgkJqoAdHrAiKX+zXn/+WaxIYP/5QbcvMuywuXvSoMSMCFwNv/mGXnsYNj23jgwg+8fL19rGzNJ9KkTVW1If1ha2HucVSTLpnZnDkvMWc5mApUmqCpTyTDn1/gOqCMlfH7okIAuBVGo3ezQFK9T5DOhuegsBJ9meb//s7rYIqgpVjRWA/hFx5Ko+2RuT+h05YZGO7d4InYEc5pUeR1rqmsvLntzTmVu/XuVLMQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 586d039f-57ba-476f-69c4-08d9df48655a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 14:47:08.2418 (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: VI1PR03MB3088 Subject: [FFmpeg-devel] [PATCH v2 11/31] lavc/libvpxenc: switch to the new FIFO API 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DD9jsIgs4pyc From: Anton Khirnov --- libavcodec/libvpxenc.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 10e5a22fa9..ab5d31e4c4 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -128,7 +128,7 @@ typedef struct VPxEncoderContext { int corpus_complexity; int tpl_model; int discard_hdr10_plus; - AVFifoBuffer *hdr10_plus_fifo; + AVFifo *hdr10_plus_fifo; /** * If the driver does not support ROI then warn the first time we * encounter a frame with ROI side data. @@ -324,39 +324,23 @@ static av_cold void free_frame_list(struct FrameListData *list) } } -static av_cold int add_hdr10_plus(AVFifoBuffer *fifo, struct FrameHDR10Plus *data) -{ - int err = av_fifo_grow(fifo, sizeof(*data)); - if (err < 0) - return err; - av_fifo_generic_write(fifo, data, sizeof(*data), NULL); - return 0; -} - -static av_cold void free_hdr10_plus_fifo(AVFifoBuffer **fifo) +static av_cold void free_hdr10_plus_fifo(AVFifo **fifo) { FrameHDR10Plus frame_hdr10_plus; - while (av_fifo_size(*fifo) >= sizeof(frame_hdr10_plus)) { - av_fifo_generic_read(*fifo, &frame_hdr10_plus, sizeof(frame_hdr10_plus), NULL); + while (av_fifo_read(*fifo, &frame_hdr10_plus, 1) >= 0) av_buffer_unref(&frame_hdr10_plus.hdr10_plus); - } - av_fifo_freep(fifo); + av_fifo_freep2(fifo); } -static int copy_hdr10_plus_to_pkt(AVFifoBuffer *fifo, AVPacket *pkt) +static int copy_hdr10_plus_to_pkt(AVFifo *fifo, AVPacket *pkt) { FrameHDR10Plus frame_hdr10_plus; uint8_t *data; - if (!pkt) - return 0; - if (av_fifo_size(fifo) < sizeof(frame_hdr10_plus)) + if (!pkt || av_fifo_peek(fifo, &frame_hdr10_plus, 1, 0) < 0) return 0; - av_fifo_generic_peek(fifo, &frame_hdr10_plus, sizeof(frame_hdr10_plus), NULL); if (!frame_hdr10_plus.hdr10_plus || frame_hdr10_plus.pts != pkt->pts) return 0; - av_fifo_generic_read(fifo, &frame_hdr10_plus, sizeof(frame_hdr10_plus), NULL); - if (!frame_hdr10_plus.hdr10_plus) - return 0; + av_fifo_drain2(fifo, 1); data = av_packet_new_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, frame_hdr10_plus.hdr10_plus->size); if (!data) { @@ -933,7 +917,8 @@ static av_cold int vpx_init(AVCodecContext *avctx, // it has PQ trc (SMPTE2084). if (enccfg.g_bit_depth > 8 && avctx->color_trc == AVCOL_TRC_SMPTE2084) { ctx->discard_hdr10_plus = 0; - ctx->hdr10_plus_fifo = av_fifo_alloc(sizeof(FrameHDR10Plus)); + ctx->hdr10_plus_fifo = av_fifo_alloc2(1, sizeof(FrameHDR10Plus), + AV_FIFO_FLAG_AUTO_GROW); if (!ctx->hdr10_plus_fifo) return AVERROR(ENOMEM); } @@ -1727,7 +1712,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, data.hdr10_plus = av_buffer_ref(hdr10_plus_metadata->buf); if (!data.hdr10_plus) return AVERROR(ENOMEM); - err = add_hdr10_plus(ctx->hdr10_plus_fifo, &data); + err = av_fifo_write(ctx->hdr10_plus_fifo, &data, 1); if (err < 0) { av_buffer_unref(&data.hdr10_plus); return err;