From patchwork Tue Jan 11 20:46:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33267 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4052090iog; Tue, 11 Jan 2022 12:55:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJylnPaZRXKNMRF+B9O6I79nCYv6JIDgyvpG939xUwAod+Gyw5Bz3u/J7F2H48JFUr5J4mQn X-Received: by 2002:aa7:d60f:: with SMTP id c15mr6041092edr.197.1641934521084; Tue, 11 Jan 2022 12:55:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641934521; cv=none; d=google.com; s=arc-20160816; b=ggLvQ6RNFTFQtQOlov5LYEilr733FDWy2mbWqbWtHxj1Qs0LUnjl76u/qyspsYvWrf CUODwY0S2c7buqPUDInBU9eKCL/s1ppbOQSLyRM97AAT/EegLeRvVIUG34rfJCdmQKMr KeORxrCdVQGEsW0VgAdrNeAW0thLUmPhk570u26K3fa+xYdasJZ7BkFt4Pyofvfo31Ei Yj/PuuieYgnksofOTYsAybMLLDxZ5F2jp1B+B68rysRcJK9v1CVdI9W5ZvwWfsSdKcUd XNKqk/oqKwN5a2/csoMT07WC7PG3P4BrwMUPq0+J0gbI8hKC29OlG2ABKPKYt21YV6TL PISw== 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=27XUX3DMXQsiWsQckGjon6WQ/rOXj3tw4NDAX5anImE=; b=U486l48wtF+meJBVx4ZmfHsDk9tC/DUmjNt7neSQNW+X41/XdSShwuZ9UPrqb71LwG ouwpAaEXkrJNrVx/cg5mOzYQzMjfYWZYiig4912F6TL0esL4SbXMW5ztT5dr4ALWy8In xe8CXGykRqqj24cb+Zqven6U6MnxPoHtUJP8WFPqQZjZeFrwlV8Yn9zMUHFxTtTAEn/l jMeo2Khyam/1UDd16GuL/QlaFSvuM7Zca1nmfwCpoGZrxv4gpwKc58xKU0Pw3uCoWEwB rbIOSPZvQb8ZAIk/GTDSkVH8f6ev+8aG83Z72vwdZTSJBeKdzx0Icm9jh8Q6/rctV1WH OG6Q== 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 nc36si3097270ejc.451.2022.01.11.12.55.20; Tue, 11 Jan 2022 12:55:21 -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 CE85368AEFF; Tue, 11 Jan 2022 22:54:56 +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 9C6E868AF10 for ; Tue, 11 Jan 2022 22:54:48 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2986C24017C for ; Tue, 11 Jan 2022 21:54:48 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 92W2z_wR0uOA for ; Tue, 11 Jan 2022 21:54:46 +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 C2D52240179 for ; Tue, 11 Jan 2022 21:54:46 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 7977B3A1041; Tue, 11 Jan 2022 21:47:25 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jan 2022 21:46:10 +0100 Message-Id: <20220111204610.14262-35-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 35/35] ffmpeg: 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: aNz0QCcCOWc6 --- fftools/ffmpeg.c | 36 ++++++++++++++---------------------- fftools/ffmpeg_filter.c | 12 ++++++------ 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index c89a95937e..319e295df3 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -525,19 +525,17 @@ static void ffmpeg_cleanup(int ret) InputFilter *ifilter = fg->inputs[j]; struct InputStream *ist = ifilter->ist; - while (av_fifo_size(ifilter->frame_queue)) { + while (av_fifo_can_read(ifilter->frame_queue)) { AVFrame *frame; - av_fifo_generic_read(ifilter->frame_queue, &frame, - sizeof(frame), NULL); + av_fifo_read(ifilter->frame_queue, &frame, 1); av_frame_free(&frame); } av_fifo_freep(&ifilter->frame_queue); av_freep(&ifilter->displaymatrix); if (ist->sub2video.sub_queue) { - while (av_fifo_size(ist->sub2video.sub_queue)) { + while (av_fifo_can_read(ist->sub2video.sub_queue)) { AVSubtitle sub; - av_fifo_generic_read(ist->sub2video.sub_queue, - &sub, sizeof(sub), NULL); + av_fifo_read(ist->sub2video.sub_queue, &sub, 1); avsubtitle_free(&sub); } av_fifo_freep(&ist->sub2video.sub_queue); @@ -1954,15 +1952,11 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_ref if (!tmp) return AVERROR(ENOMEM); - if (!av_fifo_space(ifilter->frame_queue)) { - ret = av_fifo_realloc2(ifilter->frame_queue, 2 * av_fifo_size(ifilter->frame_queue)); - if (ret < 0) { - av_frame_free(&tmp); - return ret; - } - } - av_fifo_generic_write(ifilter->frame_queue, &tmp, sizeof(tmp), NULL); - return 0; + ret = av_fifo_write(ifilter->frame_queue, &tmp, 1); + if (ret < 0) + av_frame_free(&tmp); + + return ret; } ret = reap_filters(1); @@ -2285,15 +2279,13 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, sub2video_update(ist, INT64_MIN, &subtitle); } else if (ist->nb_filters) { if (!ist->sub2video.sub_queue) - ist->sub2video.sub_queue = av_fifo_alloc(8 * sizeof(AVSubtitle)); + ist->sub2video.sub_queue = av_fifo_alloc2(8, sizeof(AVSubtitle), AV_FIFO_FLAG_AUTO_GROW); if (!ist->sub2video.sub_queue) exit_program(1); - if (!av_fifo_space(ist->sub2video.sub_queue)) { - ret = av_fifo_realloc2(ist->sub2video.sub_queue, 2 * av_fifo_size(ist->sub2video.sub_queue)); - if (ret < 0) - exit_program(1); - } - av_fifo_generic_write(ist->sub2video.sub_queue, &subtitle, sizeof(subtitle), NULL); + + ret = av_fifo_write(ist->sub2video.sub_queue, &subtitle, 1); + if (ret < 0) + exit_program(1); free_sub = 0; } diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 1f6cba2c04..c468456d54 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -178,7 +178,7 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost) ifilter->graph = fg; ifilter->format = -1; - ifilter->frame_queue = av_fifo_alloc(8 * sizeof(AVFrame*)); + ifilter->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); if (!ifilter->frame_queue) exit_program(1); @@ -286,7 +286,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) ifilter->type = ist->st->codecpar->codec_type; ifilter->name = describe_filter_link(fg, in, 1); - ifilter->frame_queue = av_fifo_alloc(8 * sizeof(AVFrame*)); + ifilter->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); if (!ifilter->frame_queue) exit_program(1); @@ -1106,9 +1106,9 @@ int configure_filtergraph(FilterGraph *fg) } for (i = 0; i < fg->nb_inputs; i++) { - while (av_fifo_size(fg->inputs[i]->frame_queue)) { + while (av_fifo_can_read(fg->inputs[i]->frame_queue)) { AVFrame *tmp; - av_fifo_generic_read(fg->inputs[i]->frame_queue, &tmp, sizeof(tmp), NULL); + av_fifo_read(fg->inputs[i]->frame_queue, &tmp, 1); ret = av_buffersrc_add_frame(fg->inputs[i]->filter, tmp); av_frame_free(&tmp); if (ret < 0) @@ -1129,9 +1129,9 @@ int configure_filtergraph(FilterGraph *fg) for (i = 0; i < fg->nb_inputs; i++) { InputStream *ist = fg->inputs[i]->ist; if (ist->sub2video.sub_queue && ist->sub2video.frame) { - while (av_fifo_size(ist->sub2video.sub_queue)) { + while (av_fifo_can_read(ist->sub2video.sub_queue)) { AVSubtitle tmp; - av_fifo_generic_read(ist->sub2video.sub_queue, &tmp, sizeof(tmp), NULL); + av_fifo_read(ist->sub2video.sub_queue, &tmp, 1); sub2video_update(ist, INT64_MIN, &tmp); avsubtitle_free(&tmp); }