From patchwork Tue Jan 11 20:45:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33257 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4049770iog; Tue, 11 Jan 2022 12:51:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxpMF+CFewu8ySOTTTYmqC/ED6CQ3KH3Hwq2gIiJjqJ0I4KTXSbjXzmdnsx547J/mFZh+/X X-Received: by 2002:aa7:d503:: with SMTP id y3mr5982796edq.224.1641934280925; Tue, 11 Jan 2022 12:51:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641934280; cv=none; d=google.com; s=arc-20160816; b=c64a/UZ/EtsJNa1A71rdhec1NpdPuiw0KFpsphFKprx37OZ21eyZuHQ9kLmJuCNlAD OgEeeUSTpY+8Or2QGGYVLjdZzeHInQ4Eamq5F2R7QJxoSYfR3LuNI+YG6yUAQAUFQP1d SBEQrmRCWYPQQapQhN8BQK5Te/OBRKUx1bvbhtgZ9yAYZqT7Wbbp4v86Z6UlKvdiZ4xS yfwA5KyeAhZ9/NdcB37J806lzSyjR/KGrdVHVd4v04bI7FWSmpmo3aQWw+pcyDjXg/0s HsY9zHbOSnOrkE50H46emJvf8FgjRGnzUTh2Xow9kigohhEYXk8fDiYAPbmb4CbmNOVi zIwg== 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=fLwx+9l/fGB5y+8lOa12OBEfossZi8GtUhvat/Sg+Zc=; b=bcHfgY5JsHGJPOOHT+78lMekR1eLjIDoe5lZ6r+OUA3byfMGclUOu1MUJqoRYTMWJa /mEpM0AoQ4NebYJ7J6OLc9tIpCmKyGtYN0ng9YrUoTkyuWL1GlrYoyhjs6zmvNcNIgrn dmdiXORI0+8mLQZ0mKYnqCLQWX/icNEbYz55vlsp0tk9/lOswmKPIxMuaxkj5NThs8qv HlE8XJjSiWGP+ixqPW7Q/I15crnKiBOP5sOFb81GER/6BZflcuMSJ/jTCVb/kWuBMTRl NSB9XdMA2mw5wp41MSU2xFq0f0rHRhv3wmoz7vmBMW0YK2ZStcki8KGrwZr/95K37W37 NVwA== 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 w19si3388281edq.469.2022.01.11.12.51.19; Tue, 11 Jan 2022 12:51:20 -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 6D1A668AFDE; Tue, 11 Jan 2022 22:47:55 +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 C44F068AE7A for ; Tue, 11 Jan 2022 22:47:32 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6E48F240512 for ; Tue, 11 Jan 2022 21:47:30 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Z-yml2HkJYlX for ; Tue, 11 Jan 2022 21:47:29 +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 93C5524055A for ; Tue, 11 Jan 2022 21:47:25 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 1E8073A0A44; Tue, 11 Jan 2022 21:47:25 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jan 2022 21:45:48 +0100 Message-Id: <20220111204610.14262-13-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 13/35] lavc/amfenc: switch to 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: EP3BSty/XbCt --- fftools/ffmpeg_mux.c | 22 +++++++++++----------- fftools/ffmpeg_opt.c | 2 -- libavcodec/amfenc.c | 39 +++++++++++++-------------------------- 3 files changed, 24 insertions(+), 39 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 52986b002a..e97d7d50c6 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -126,11 +126,11 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) AVPacket *tmp_pkt; int ret; - if (!av_fifo_space(ms->muxing_queue)) { - size_t cur_size = av_fifo_size(ms->muxing_queue); + if (!av_fifo_can_write(ms->muxing_queue)) { + size_t cur_size = av_fifo_can_read(ms->muxing_queue); unsigned int are_we_over_size = (ms->muxing_queue_data_size + pkt->size) > ost->muxing_queue_data_threshold; - size_t limit = are_we_over_size ? ost->max_muxing_queue_size : INT_MAX; + size_t limit = are_we_over_size ? ost->max_muxing_queue_size : SIZE_MAX; size_t new_size = FFMIN(2 * cur_size, limit); if (new_size <= cur_size) { @@ -139,7 +139,7 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) ost->file_index, ost->st->index); return AVERROR(ENOSPC); } - ret = av_fifo_realloc2(ms->muxing_queue, new_size); + ret = av_fifo_grow2(ms->muxing_queue, new_size - cur_size); if (ret < 0) return ret; } @@ -154,7 +154,7 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) av_packet_move_ref(tmp_pkt, pkt); ms->muxing_queue_data_size += tmp_pkt->size; - av_fifo_generic_write(ms->muxing_queue, &tmp_pkt, sizeof(tmp_pkt), NULL); + av_fifo_write(ms->muxing_queue, &tmp_pkt, 1); return 0; } @@ -369,12 +369,12 @@ int of_check_init(OutputFile *of) OutputStream *ost = output_streams[of->ost_index + i]; /* try to improve muxing time_base (only possible if nothing has been written yet) */ - if (!av_fifo_size(ms->muxing_queue)) + if (!av_fifo_can_read(ms->muxing_queue)) ost->mux_timebase = ost->st->time_base; - while (av_fifo_size(ms->muxing_queue)) { + while (av_fifo_can_read(ms->muxing_queue)) { AVPacket *pkt; - av_fifo_generic_read(ms->muxing_queue, &pkt, sizeof(pkt), NULL); + av_fifo_read(ms->muxing_queue, &pkt, 1); ms->muxing_queue_data_size -= pkt->size; write_packet(of, ost, pkt); av_packet_free(&pkt); @@ -429,9 +429,9 @@ static void mux_free(Muxer **pmux, int nb_streams) if (!ms->muxing_queue) continue; - while (av_fifo_size(ms->muxing_queue)) { + while (av_fifo_can_read(ms->muxing_queue)) { AVPacket *pkt; - av_fifo_generic_read(ms->muxing_queue, &pkt, sizeof(pkt), NULL); + av_fifo_read(ms->muxing_queue, &pkt, 1); av_packet_free(&pkt); } av_fifo_freep(&ms->muxing_queue); @@ -479,7 +479,7 @@ int of_muxer_init(OutputFile *of, AVDictionary *opts, int64_t limit_filesize) for (int i = 0; i < of->ctx->nb_streams; i++) { MuxStream *ms = &mux->streams[i]; - ms->muxing_queue = av_fifo_alloc(8 * sizeof(AVPacket*)); + ms->muxing_queue = av_fifo_alloc2(8, sizeof(AVPacket*), 0); if (!ms->muxing_queue) { ret = AVERROR(ENOMEM); goto fail; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index cb21a6a42c..4fede8471e 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1610,8 +1610,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ost->max_muxing_queue_size = 128; MATCH_PER_STREAM_OPT(max_muxing_queue_size, i, ost->max_muxing_queue_size, oc, st); - ost->max_muxing_queue_size = FFMIN(ost->max_muxing_queue_size, INT_MAX / sizeof(ost->pkt)); - ost->max_muxing_queue_size *= sizeof(ost->pkt); ost->muxing_queue_data_threshold = 50*1024*1024; MATCH_PER_STREAM_OPT(muxing_queue_data_threshold, i, ost->muxing_queue_data_threshold, oc, st); diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index fb23ed738c..3a8dd2b007 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -117,8 +117,9 @@ static int amf_load_library(AVCodecContext *avctx) if (!ctx->delayed_frame) { return AVERROR(ENOMEM); } - // hardcoded to current HW queue size - will realloc in timestamp_queue_enqueue() if too small - ctx->timestamp_list = av_fifo_alloc((avctx->max_b_frames + 16) * sizeof(int64_t)); + // hardcoded to current HW queue size - will auto-realloc if too small + ctx->timestamp_list = av_fifo_alloc2(avctx->max_b_frames + 16, sizeof(int64_t), + AV_FIFO_FLAG_AUTO_GROW); if (!ctx->timestamp_list) { return AVERROR(ENOMEM); } @@ -432,18 +433,6 @@ static int amf_copy_surface(AVCodecContext *avctx, const AVFrame *frame, return 0; } -static inline int timestamp_queue_enqueue(AVCodecContext *avctx, int64_t timestamp) -{ - AmfContext *ctx = avctx->priv_data; - if (av_fifo_space(ctx->timestamp_list) < sizeof(timestamp)) { - if (av_fifo_grow(ctx->timestamp_list, sizeof(timestamp)) < 0) { - return AVERROR(ENOMEM); - } - } - av_fifo_generic_write(ctx->timestamp_list, ×tamp, sizeof(timestamp), NULL); - return 0; -} - static int amf_copy_buffer(AVCodecContext *avctx, AVPacket *pkt, AMFBuffer *buffer) { AmfContext *ctx = avctx->priv_data; @@ -479,21 +468,19 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket *pkt, AMFBuffer *buff pkt->pts = var.int64Value; // original pts - AMF_RETURN_IF_FALSE(ctx, av_fifo_size(ctx->timestamp_list) > 0, AVERROR_UNKNOWN, "timestamp_list is empty\n"); + AMF_RETURN_IF_FALSE(ctx, av_fifo_can_read(ctx->timestamp_list) > 0, AVERROR_UNKNOWN, "timestamp_list is empty\n"); - av_fifo_generic_read(ctx->timestamp_list, ×tamp, sizeof(timestamp), NULL); + av_fifo_read(ctx->timestamp_list, ×tamp, 1); // calc dts shift if max_b_frames > 0 if (avctx->max_b_frames > 0 && ctx->dts_delay == 0) { int64_t timestamp_last = AV_NOPTS_VALUE; - AMF_RETURN_IF_FALSE(ctx, av_fifo_size(ctx->timestamp_list) > 0, AVERROR_UNKNOWN, + AMF_RETURN_IF_FALSE(ctx, av_fifo_can_read(ctx->timestamp_list) > 0, AVERROR_UNKNOWN, "timestamp_list is empty while max_b_frames = %d\n", avctx->max_b_frames); - av_fifo_generic_peek_at( + av_fifo_peek( ctx->timestamp_list, - ×tamp_last, - (av_fifo_size(ctx->timestamp_list) / sizeof(timestamp) - 1) * sizeof(timestamp_last), - sizeof(timestamp_last), - NULL); + ×tamp_last, 1, + (av_fifo_can_read(ctx->timestamp_list) - 1)); if (timestamp < 0 || timestamp_last < AV_NOPTS_VALUE) { return AVERROR(ERANGE); } @@ -710,9 +697,9 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "SubmitInput() failed with error %d\n", res); av_frame_unref(frame); - if ((ret = timestamp_queue_enqueue(avctx, pts)) < 0) { + ret = av_fifo_write(ctx->timestamp_list, &pts, 1); + if (ret < 0) return ret; - } } } @@ -751,9 +738,9 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) av_frame_unref(ctx->delayed_frame); AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "Repeated SubmitInput() failed with error %d\n", res); - if ((ret = timestamp_queue_enqueue(avctx, pts)) < 0) { + ret = av_fifo_write(ctx->timestamp_list, &pts, 1); + if (ret < 0) return ret; - } } else { av_log(avctx, AV_LOG_WARNING, "Data acquired but delayed frame submission got AMF_INPUT_FULL- should not happen\n"); }