From patchwork Tue Oct 1 10:54:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp296430vqv; Tue, 1 Oct 2024 07:01:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXtCeyslbpMTzrvtl0NLJBnO7eKbawPsy7f/FwJWWSiexazZ4j8/BW8zh2AX8Zzf4tDMAWgTt+no7+TqLbjv9BO@gmail.com X-Google-Smtp-Source: AGHT+IFJ0zbGJ9RxcAPTSDU69IoLFd9AeGsBNyHXopG0ovLqgZ2rgy19F0gPvExa6KagMiwg6Pnj X-Received: by 2002:a05:6402:1599:b0:5c3:d8fb:df6a with SMTP id 4fb4d7f45d1cf-5c8a2a3199bmr3524471a12.14.1727791278306; Tue, 01 Oct 2024 07:01:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727791278; cv=none; d=google.com; s=arc-20240605; b=Kwtdkr9fE0zazH86r05gf5JD8QZdjd7eA/Rg/tean8L9G4klg5euH9w51Mdj3qlIDN dlTIJa2EpZPNnjXpDhTUQo5qjrglyPo4v0upRlCxrrKARgrWUE9nw+Rb0mys2z350Il/ 1XgBGHz0GAHsIA4NaUBYlUa8X3pK/AxX+5si/yKCL0cf9AgsmW1CMkFMi6xRyxqSLxF8 tGyOpPA3CtHogjSteXryJf+BNsNyBMc5chqxMAse0mUgMziGWVkEwZ767QwbyLlpNKEr BbhOD4CQKjQE5sTA8ctpEBo0NUq0m/ViOtQ+AoILvkzpWN7ZVGs6aS9OpxA7xQgWLOnj D9dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:dkim-signature:delivered-to; bh=Ib7dn75pyPYYZ8l08ZZO/XbmIqa4pLNV+gYc8S9qah4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=AtSNN/r4ciOxmM6tSibubHwlrY0l4gMXmZKVMtyGIP0NDP3UnV0oXDeYbWqYciBK+O x9YeG8AEVa+hA0ZL4Vy9yPlv5x8Eq2hGJ/bIvaC9yMN9yoP+0N51wXWVu4PAWrA5fJFC /DsLFx9QlwxVZdzWjH7OPyX1TbVIVME0sIZ8LXFs9c4jdXuLxvRxQxw09L7kYcVkFMnV dabZ2S6yOM4LQkCoAAQCsNq5lZWyR+/as33PvZPbVIlECbEE/nZWcNsDakaL8g5gGarA yDEyPwTs3q4x7+yxism8xgChj8ohR+Ra7XKq4lExOoRWVL0vHb9mkU4Mokf9fZIZFxDh I00A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=FMvP2NAU; 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 4fb4d7f45d1cf-5c882407fe1si7468924a12.44.2024.10.01.07.01.17; Tue, 01 Oct 2024 07:01:18 -0700 (PDT) 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=@khirnov.net header.s=mail header.b=FMvP2NAU; 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 D4DF668DB16; Tue, 1 Oct 2024 13:54:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 642AD68DBCD for ; Tue, 1 Oct 2024 13:54:41 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=FMvP2NAU; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id B438C4E1A for ; Tue, 1 Oct 2024 12:54:35 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 3SU_drc2CeDN for ; Tue, 1 Oct 2024 12:54:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727780072; bh=MLmb6oiYIP5wqiH2wh1N2OeOeLV1DDDCzXYCnLf70tw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=FMvP2NAUgQwcrvvZyGtmTF2qj9IHxtFrFh/43aM8hKiB/ST2rQzcexRayHTf/djqr rAc9o2ogDQwHXxQN2BHtFcwKWlFfVx3sJ0oQ2c/trfIV4hVEPQ3Q31NzHmjHkC7Omk gvoXqniOA2f8yaDH7AuMgcJgqHrpPIRH0jn2d3TwDTqHhJxa29V4zxrvlG6nJYUbpK gsIcNNwk78A34z5CtI1jzBaeqr/QMxpsITuOH9+Gpcp5MmkmA+QKqiOtqfPpDuiAOT zHgWJgVXN0FMBfVujv89f3SD+Xmjdz3PrxrcypBM/Bmv++iSVA0i55Jdy4gzvjqvhz agu18StSjFiLw== 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 mail1.khirnov.net (Postfix) with ESMTPS id E2BD74E1E for ; Tue, 1 Oct 2024 12:54:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 50A6F3A2668 for ; Tue, 01 Oct 2024 12:54:26 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Oct 2024 12:54:18 +0200 Message-ID: <20241001105421.28967-13-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241001105421.28967-1-anton@khirnov.net> References: <20241001105421.28967-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/16] lavfi/src_movie: switch to query_func2() 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: qMxvyR+xG9Vk --- libavfilter/src_movie.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index e7817c7ee7..65091b65f0 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -411,34 +411,36 @@ static av_cold void movie_uninit(AVFilterContext *ctx) avformat_close_input(&movie->format_ctx); } -static int movie_query_formats(AVFilterContext *ctx) +static int movie_query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - MovieContext *movie = ctx->priv; + const MovieContext *movie = ctx->priv; int list[] = { 0, -1 }; AVChannelLayout list64[] = { { 0 }, { 0 } }; int i, ret; for (i = 0; i < ctx->nb_outputs; i++) { - MovieStream *st = &movie->st[i]; - AVCodecParameters *c = st->st->codecpar; - AVFilterLink *outlink = ctx->outputs[i]; + const MovieStream *st = &movie->st[i]; + const AVCodecParameters *c = st->st->codecpar; + AVFilterFormatsConfig *cfg = cfg_out[i]; switch (c->codec_type) { case AVMEDIA_TYPE_VIDEO: list[0] = c->format; - if ((ret = ff_formats_ref(ff_make_format_list(list), &outlink->incfg.formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(list), &cfg->formats)) < 0) return ret; break; case AVMEDIA_TYPE_AUDIO: list[0] = c->format; - if ((ret = ff_formats_ref(ff_make_format_list(list), &outlink->incfg.formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(list), &cfg->formats)) < 0) return ret; list[0] = c->sample_rate; - if ((ret = ff_formats_ref(ff_make_format_list(list), &outlink->incfg.samplerates)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(list), &cfg->samplerates)) < 0) return ret; list64[0] = c->ch_layout; if ((ret = ff_channel_layouts_ref(ff_make_channel_layout_list(list64), - &outlink->incfg.channel_layouts)) < 0) + &cfg->channel_layouts)) < 0) return ret; break; } @@ -681,7 +683,7 @@ const AVFilter ff_avsrc_movie = { .init = movie_common_init, .activate = activate, .uninit = movie_uninit, - FILTER_QUERY_FUNC(movie_query_formats), + FILTER_QUERY_FUNC2(movie_query_formats), .inputs = NULL, .outputs = NULL, @@ -701,7 +703,7 @@ const AVFilter ff_avsrc_amovie = { .init = movie_common_init, .activate = activate, .uninit = movie_uninit, - FILTER_QUERY_FUNC(movie_query_formats), + FILTER_QUERY_FUNC2(movie_query_formats), .inputs = NULL, .outputs = NULL,