From patchwork Fri Jul 7 09:48:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp7162764pzh; Fri, 7 Jul 2023 02:51:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlFRa910gEE6rcJSRn9xvTrOdt3eBF8xRSyG4JuLiqTU0VJw036qSI+YfAdfBMqkl6FNvx2F X-Received: by 2002:a17:906:3f48:b0:98e:16b7:e024 with SMTP id f8-20020a1709063f4800b0098e16b7e024mr3770100ejj.38.1688723505226; Fri, 07 Jul 2023 02:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688723505; cv=none; d=google.com; s=arc-20160816; b=M2Lm4nWyNOhbmMe/3fohwDxdphdz0wala5WbsDL7YEwZ9LU+KmwyGnCNdLQoKpybrG NjDJTSj9MkvPNvmhd2pGMH8gbinwpCmU5LjpmdtrxzUK5MEsa+oi0WVbH8jUm7rGRUEw XQj147H0VvQ+A+M0F8WdYWnWEc/tm/06fWieCqM5msa1ysxAX7B4JIvtgJM1+d7tNKej hGDk0CXnsCAxUyaQrQSYvJt6yAKi/hv0kGoxsBR9AqXlSAF3zskaVQE43ayWAV+sE1IN Hw4Mfepu896iZKubIEnRZNqBlXmYPu9jcr9HSnGwriERy69EHF78wgAdk6PJgeiGEsvU UhpA== 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=l/1i0I7ppvs79fIXkn35qiNLq0C9K21BNPbGBfkFwaA=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=hReqB9yXmu7nlyg7Ty0r+ViApUo4QOPU8YaetElasNyzA6YYrI762x56bl179yUMR+ P3uwptLxtJRyergaECT24xQMZwRCyvGKkKn9WfUvezxcGoydCAwx0jmdWp+JCtjTOK9H +imyxSeYV/Lf3HMsL/AzqSjN/SWqxVv7nfSWjoAZ/8zmeedI4acd9vGSWL4duQQHjckg gZEuSmgStbEqiCxdbOiAkPCFy6NnK3k3sRrBUl4Zgy/s0G9vYtBcHptYzieuQQCg6fIl 1aut9mH8oZ0V6CmolOBszKKlSkaw0eyY8QuR7OWhB/TqKW6XwTQgA0elsL6AR6GF96/M jVtQ== 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 d13-20020a170906c20d00b00992ee70a0afsi1964186ejz.12.2023.07.07.02.51.44; Fri, 07 Jul 2023 02:51:45 -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; 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 73A6268C81B; Fri, 7 Jul 2023 12:49:26 +0300 (EEST) 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 4EB0968C7E1 for ; Fri, 7 Jul 2023 12:49:07 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 87064240591 for ; Fri, 7 Jul 2023 11:49:03 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id bTDFQjCqCTy1 for ; Fri, 7 Jul 2023 11:49:02 +0200 (CEST) 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 CE8132405B5 for ; Fri, 7 Jul 2023 11:49:00 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8BD923A12E0 for ; Fri, 7 Jul 2023 11:48:54 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jul 2023 11:48:33 +0200 Message-Id: <20230707094847.25324-8-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230707094847.25324-1-anton@khirnov.net> References: <20230707094847.25324-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/22] fftools/ffmpeg_filter: make OutputFile.format/sample_rate private 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: MNw6qbM8Ag7U They are not used outside of the filtering code. --- fftools/ffmpeg.h | 2 -- fftools/ffmpeg_filter.c | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 316cd2b7a6..5b4117eeea 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -296,8 +296,6 @@ typedef struct OutputFilter { /* desired output stream properties */ int width, height; - int format; - int sample_rate; AVChannelLayout ch_layout; // those are only set if no format is specified and the encoder gives us multiple options diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 432e2fced9..b1fda7b9e8 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -133,6 +133,19 @@ static InputFilterPriv *ifp_from_ifilter(InputFilter *ifilter) return (InputFilterPriv*)ifilter; } +typedef struct OutputFilterPriv { + OutputFilter ofilter; + + /* desired output stream properties */ + int format; + int sample_rate; +} OutputFilterPriv; + +static OutputFilterPriv *ofp_from_ofilter(OutputFilter *ofilter) +{ + return (OutputFilterPriv*)ofilter; +} + static int configure_filtergraph(FilterGraph *fg); static int sub2video_get_blank_frame(InputFilterPriv *ifp) @@ -333,11 +346,12 @@ static const char *choose_pix_fmts(OutputFilter *ofilter, AVBPrint *bprint) #define DEF_CHOOSE_FORMAT(name, type, var, supported_list, none, printf_format, get_name) \ static void choose_ ## name (OutputFilter *ofilter, AVBPrint *bprint) \ { \ - if (ofilter->var == none && !ofilter->supported_list) \ + OutputFilterPriv *ofp = ofp_from_ofilter(ofilter); \ + if (ofp->var == none && !ofilter->supported_list) \ return; \ av_bprintf(bprint, #name "="); \ - if (ofilter->var != none) { \ - av_bprintf(bprint, printf_format, get_name(ofilter->var)); \ + if (ofp->var != none) { \ + av_bprintf(bprint, printf_format, get_name(ofp->var)); \ } else { \ const type *p; \ \ @@ -580,11 +594,14 @@ static char *describe_filter_link(FilterGraph *fg, AVFilterInOut *inout, int in) static OutputFilter *ofilter_alloc(FilterGraph *fg) { + OutputFilterPriv *ofp; OutputFilter *ofilter; - ofilter = ALLOC_ARRAY_ELEM(fg->outputs, fg->nb_outputs); + ofp = allocate_array_elem(&fg->outputs, sizeof(*ofp), + &fg->nb_outputs); + ofilter = &ofp->ofilter; ofilter->graph = fg; - ofilter->format = -1; + ofp->format = -1; ofilter->last_pts = AV_NOPTS_VALUE; return ofilter; @@ -653,6 +670,7 @@ static void set_channel_layout(OutputFilter *f, OutputStream *ost) void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost) { + OutputFilterPriv *ofp = ofp_from_ofilter(ofilter); FilterGraph *fg = ofilter->graph; const AVCodec *c = ost->enc_ctx->codec; @@ -666,19 +684,19 @@ void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost) ofilter->width = ost->enc_ctx->width; ofilter->height = ost->enc_ctx->height; if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) { - ofilter->format = ost->enc_ctx->pix_fmt; + ofp->format = ost->enc_ctx->pix_fmt; } else { ofilter->formats = c->pix_fmts; } break; case AVMEDIA_TYPE_AUDIO: if (ost->enc_ctx->sample_fmt != AV_SAMPLE_FMT_NONE) { - ofilter->format = ost->enc_ctx->sample_fmt; + ofp->format = ost->enc_ctx->sample_fmt; } else { ofilter->formats = c->sample_fmts; } if (ost->enc_ctx->sample_rate) { - ofilter->sample_rate = ost->enc_ctx->sample_rate; + ofp->sample_rate = ost->enc_ctx->sample_rate; } else { ofilter->sample_rates = c->supported_samplerates; } @@ -1570,14 +1588,15 @@ static int configure_filtergraph(FilterGraph *fg) * make sure they stay the same if the filtergraph is reconfigured later */ for (i = 0; i < fg->nb_outputs; i++) { OutputFilter *ofilter = fg->outputs[i]; + OutputFilterPriv *ofp = ofp_from_ofilter(ofilter); AVFilterContext *sink = ofilter->filter; - ofilter->format = av_buffersink_get_format(sink); + ofp->format = av_buffersink_get_format(sink); ofilter->width = av_buffersink_get_w(sink); ofilter->height = av_buffersink_get_h(sink); - ofilter->sample_rate = av_buffersink_get_sample_rate(sink); + ofp->sample_rate = av_buffersink_get_sample_rate(sink); av_channel_layout_uninit(&ofilter->ch_layout); ret = av_buffersink_get_ch_layout(sink, &ofilter->ch_layout); if (ret < 0)