From patchwork Tue Jan 11 20:45:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33246 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4048656iog; Tue, 11 Jan 2022 12:49:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzTw/0X2YV+Oc36l+DDu1XReKi5rRSrBlBsf06SIcSL6QPUGS35QTEoxUzbAU9haldkKYVm X-Received: by 2002:a05:6402:5241:: with SMTP id t1mr5971388edd.291.1641934171690; Tue, 11 Jan 2022 12:49:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641934171; cv=none; d=google.com; s=arc-20160816; b=0duMIFFOvNB9iHp3/ecFlNq/nJHhfjqQGvGlAZXen7yrZS/BGfhxPqa6u3l9xKVQoq w/Oebm2I8sECWE7GMRZfSUbczf3WzaPqhtxXhWkoMTGeMedaoyEywPi0MCv0obM6tFQS TYKd4B/k7Jh1/k+j0pOlgs2l3z/14p6PiIN/NnUkQttERomoRWoaSBx7cUXw6szXfmVt Avd9bQLvQ2pXmvTDLP8O7pfiyX7LpmfGF02GuBEATT+/0pONobHfLdHIyQSNt+qGW7VL 7Hp+W7uulEqx4taqaxP8VABDewQz6UDeh0AnSf0JOJhGvKijjUVwQURpImND9kx9l3dW AE8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=s4hmk+k4Q/asLGU+WUJGYqEYgtXkr9cBEMfv502UBM4=; b=D87+MnVZGwX7mTPeZrV/UR1QBuzHSCuGR8NUALJjqB3QsIaTNqJodD1iJhzZfUgy9Z rY6Pl0LBnQ1kA4SZB0IRiEQnGX6/LMA5QjRHLKnsxl3SCGX0D8quJaw0Gvdg1rHunsLA bPcWlpkMwyW9l2oJ57jsTD8SueeBeKZnDrc+IPlxadzzX7sYrXpitj2U4l57T46d6Tlj eNXrpPpky+5sMFPbSv+MIx6kWrrIlXLvFRg4Ebm2dsBMBTLrsabQ5xBoFsNW7RWto80g y3StFObKzNu7x8FQu82zS66XknBnJKcEyQXWcI+dA0aMqmDU6tjOY6B5yj/Sb/w3j52s Xpzg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u4si6178052ejy.613.2022.01.11.12.49.31; Tue, 11 Jan 2022 12:49: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13C8D68AF89; Tue, 11 Jan 2022 22:47:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C7CD68AC71 for ; Tue, 11 Jan 2022 22:47:35 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 9C14224017C for ; Tue, 11 Jan 2022 21:47:34 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id MnJl2XItXrnS for ; Tue, 11 Jan 2022 21:47:33 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3C16D2405F0 for ; Tue, 11 Jan 2022 21:47:26 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 378D43A0BF3; Tue, 11 Jan 2022 21:47:25 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jan 2022 21:45:54 +0100 Message-Id: <20220111204610.14262-19-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220111204610.14262-1-anton@khirnov.net> References: <20220111204610.14262-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/35] lavc/nvenc: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: idj/I/e2EXS0 --- libavcodec/nvenc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 850c46022b..ae57399e96 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1568,7 +1568,7 @@ static av_cold int nvenc_alloc_surface(AVCodecContext *avctx, int idx) ctx->surfaces[idx].output_surface = allocOut.bitstreamBuffer; - av_fifo_generic_write(ctx->unused_surface_queue, &tmp_surface, sizeof(tmp_surface), NULL); + av_fifo_write(ctx->unused_surface_queue, &tmp_surface, 1); return 0; } @@ -1582,18 +1582,18 @@ static av_cold int nvenc_setup_surfaces(AVCodecContext *avctx) if (!ctx->surfaces) return AVERROR(ENOMEM); - ctx->timestamp_list = av_fifo_alloc(ctx->nb_surfaces * sizeof(int64_t)); + ctx->timestamp_list = av_fifo_alloc2(ctx->nb_surfaces, sizeof(int64_t), 0); if (!ctx->timestamp_list) return AVERROR(ENOMEM); - ctx->unused_surface_queue = av_fifo_alloc(ctx->nb_surfaces * sizeof(NvencSurface*)); + ctx->unused_surface_queue = av_fifo_alloc2(ctx->nb_surfaces, sizeof(NvencSurface*), 0); if (!ctx->unused_surface_queue) return AVERROR(ENOMEM); - ctx->output_surface_queue = av_fifo_alloc(ctx->nb_surfaces * sizeof(NvencSurface*)); + ctx->output_surface_queue = av_fifo_alloc2(ctx->nb_surfaces, sizeof(NvencSurface*), 0); if (!ctx->output_surface_queue) return AVERROR(ENOMEM); - ctx->output_surface_ready_queue = av_fifo_alloc(ctx->nb_surfaces * sizeof(NvencSurface*)); + ctx->output_surface_ready_queue = av_fifo_alloc2(ctx->nb_surfaces, sizeof(NvencSurface*), 0); if (!ctx->output_surface_ready_queue) return AVERROR(ENOMEM); @@ -1777,11 +1777,11 @@ static NvencSurface *get_free_frame(NvencContext *ctx) { NvencSurface *tmp_surf; - if (!(av_fifo_size(ctx->unused_surface_queue) > 0)) + if (!av_fifo_can_read(ctx->unused_surface_queue)) // queue empty return NULL; - av_fifo_generic_read(ctx->unused_surface_queue, &tmp_surf, sizeof(tmp_surf), NULL); + av_fifo_read(ctx->unused_surface_queue, &tmp_surf, 1); return tmp_surf; } @@ -2000,14 +2000,14 @@ static void nvenc_codec_specific_pic_params(AVCodecContext *avctx, static inline void timestamp_queue_enqueue(AVFifoBuffer* queue, int64_t timestamp) { - av_fifo_generic_write(queue, ×tamp, sizeof(timestamp), NULL); + av_fifo_write(queue, ×tamp, 1); } static inline int64_t timestamp_queue_dequeue(AVFifoBuffer* queue) { int64_t timestamp = AV_NOPTS_VALUE; - if (av_fifo_size(queue) > 0) - av_fifo_generic_read(queue, ×tamp, sizeof(timestamp), NULL); + if (av_fifo_can_read(queue)) + av_fifo_read(queue, ×tamp, 1); return timestamp; } @@ -2152,8 +2152,8 @@ static int output_ready(AVCodecContext *avctx, int flush) NvencContext *ctx = avctx->priv_data; int nb_ready, nb_pending; - nb_ready = av_fifo_size(ctx->output_surface_ready_queue) / sizeof(NvencSurface*); - nb_pending = av_fifo_size(ctx->output_surface_queue) / sizeof(NvencSurface*); + nb_ready = av_fifo_can_read(ctx->output_surface_ready_queue); + nb_pending = av_fifo_can_read(ctx->output_surface_queue); if (flush) return nb_ready > 0; return (nb_ready > 0) && (nb_ready + nb_pending >= ctx->async_depth); @@ -2442,15 +2442,15 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) return nvenc_print_error(avctx, nv_status, "EncodePicture failed!"); if (frame && frame->buf[0]) { - av_fifo_generic_write(ctx->output_surface_queue, &in_surf, sizeof(in_surf), NULL); + av_fifo_write(ctx->output_surface_queue, &in_surf, 1); timestamp_queue_enqueue(ctx->timestamp_list, frame->pts); } /* all the pending buffers are now ready for output */ if (nv_status == NV_ENC_SUCCESS) { - while (av_fifo_size(ctx->output_surface_queue) > 0) { - av_fifo_generic_read(ctx->output_surface_queue, &tmp_out_surf, sizeof(tmp_out_surf), NULL); - av_fifo_generic_write(ctx->output_surface_ready_queue, &tmp_out_surf, sizeof(tmp_out_surf), NULL); + while (av_fifo_can_read(ctx->output_surface_queue)) { + av_fifo_read (ctx->output_surface_queue, &tmp_out_surf, 1); + av_fifo_write(ctx->output_surface_ready_queue, &tmp_out_surf, 1); } } @@ -2483,7 +2483,7 @@ int ff_nvenc_receive_packet(AVCodecContext *avctx, AVPacket *pkt) av_frame_unref(frame); if (output_ready(avctx, avctx->internal->draining)) { - av_fifo_generic_read(ctx->output_surface_ready_queue, &tmp_out_surf, sizeof(tmp_out_surf), NULL); + av_fifo_read(ctx->output_surface_ready_queue, &tmp_out_surf, 1); res = nvenc_push_context(avctx); if (res < 0) @@ -2498,7 +2498,7 @@ int ff_nvenc_receive_packet(AVCodecContext *avctx, AVPacket *pkt) if (res) return res; - av_fifo_generic_write(ctx->unused_surface_queue, &tmp_out_surf, sizeof(tmp_out_surf), NULL); + av_fifo_write(ctx->unused_surface_queue, &tmp_out_surf, 1); } else if (avctx->internal->draining) { return AVERROR_EOF; } else {