From patchwork Fri Apr 5 16:11:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47839 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1069927pzd; Fri, 5 Apr 2024 09:14:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX1pEg2hPgx9CUgLnY2dpY5rtriogs1z5jrm+qL2libYb2TMmYs5PF+taUd3B5vCHglD38A3qVOPvbNUQ3eNrSW23hpF+boeYQpjw== X-Google-Smtp-Source: AGHT+IEluCKfjpHRN1frfqRlANNw7JNBPtRR/kZgoN3asvipm94E+BW7qfp0dE6OfCF1Eb1zHoId X-Received: by 2002:a19:c514:0:b0:515:c7c9:b14e with SMTP id w20-20020a19c514000000b00515c7c9b14emr1143532lfe.57.1712333699319; Fri, 05 Apr 2024 09:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712333699; cv=none; d=google.com; s=arc-20160816; b=p86Oe4Hq+3RWCWkPf2QRjZIybOwgly/9aC78sv5BAqgj/85JX7q5FMXmqNAkNoOSho A6IcdC1rytk6+Ye8rlQnCem9qfF47esdaxqCwJXM81VLvCjcQJTcik5DeZ6Q24VDXTtR S+6nUKgjeKEqrQGg1X6dIKAp+dtEnf87OFVkMy+bdD2a3uwmL29R1WLgpJahwAx/Ev1G qp9T8voOiDicOts5BM0I/wYS9i843zmKacnyJfvFNLNjymReZag9a45RtPqO7s/0I2sp UMWu1IOnEuD5YUf/MmtPj39+98s2I0k99+VfvFz4GwlpV6bH+JzcMFf0033WBP38xb52 pNIg== 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:dkim-signature:delivered-to; bh=/XsinMCmCzpJZdLdyJcU3lQn0pADlPZRFPxdXE+qt+Q=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OWH8kL10WfCM0vpLktxLFAbQDj/cU/eXm47OLMhkAxz8l95Z2EH9WAu499mxpzsK8S tu+pNm0ELNhADoqt1ObA8gJZeIfjWaXG6F3xCmu0XEYUhkaYEQghpeYNMRy03rc8PVaB titXI2dYKcpuOdLSREGwX1Yu+n3Dk6neElUqZ2P6xXokxkvTZQF3wuvqlWaNQwW5n0bL nOo1xl5uq0SGR9TtrEN+tLv4hdLyDUrVLlNTHtuiSDvulIq/UFo+xpoDgT9PwdDCejri zmIU9ao6H6jpFYV5j4hplyLYlj41jSMCwG65uum1xTmTiO6eNmAVnbILaIjpXlGLEXPX GN1w==; 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=nyvYLYR0; 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 t6-20020a17090616c600b00a518557a252si859653ejd.48.2024.04.05.09.14.51; Fri, 05 Apr 2024 09:14:59 -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=nyvYLYR0; 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 1A60568D1FA; Fri, 5 Apr 2024 19:13:21 +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 43B7568D16F for ; Fri, 5 Apr 2024 19:13:10 +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=nyvYLYR0; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 622211D2E for ; Fri, 5 Apr 2024 18:13:05 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id P-Me3p3WDc_t for ; Fri, 5 Apr 2024 18:13:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712333582; bh=VqtqOo/fLxgM+iVFqoPTDZl02r6vM4X8orDqE3a/ggw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=nyvYLYR0Bks9nDVis+A+e6IT9gc3Vqau809NmRJXW3KdMdrz1f2aQc9IrEXRVxF1o RuVhdtIZv9bJG8rY1+zhKzz+JPkUal6tYWpP5ARwyO6miMaVcBaAsAAZMztRI6XFWt yN11oD/sdS8U9Vo+czFsPF+Agl9vuA+qqwfuulxbam/xUebRjJzESOiTKVCMPSgiyo i+asVBo0QDAjLyNVvRQ9auXakjUajeHlGqHdIzCV9FTPki7Y0IUgbtKZlj5ix2IxE6 YGTah/Z1ig6cFKGxsQ/NM77Y346W+uiHQoRvfEmh+L3c9uZ0tgiDwAvfjlsP1g3c3o 84qheZ71L9lpQ== 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 2FCC74D7C for ; Fri, 5 Apr 2024 18:13:02 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D09783A0DA6 for ; Fri, 5 Apr 2024 18:12:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 18:11:50 +0200 Message-ID: <20240405161212.26167-9-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240405161212.26167-1-anton@khirnov.net> References: <20240405161212.26167-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/31] fftools/ffmpeg_filter: pass enc_timebase through OutputFilterOptions 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: K4TrsqDIk1fS Reduces the need to access OutputStream, which will allow decoupling filtering from encoding in future commits. --- fftools/ffmpeg.h | 7 +++++-- fftools/ffmpeg_filter.c | 2 +- fftools/ffmpeg_mux_init.c | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 300ad8a987..56c2fedcc4 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -273,6 +273,11 @@ typedef struct OutputFilterOptions { int64_t ts_offset; + /* Desired output timebase. + * Numerator can be one of EncTimeBase values, or 0 when no preference. + */ + AVRational output_tb; + // A combination of OFilterFlags. unsigned flags; } OutputFilterOptions; @@ -529,8 +534,6 @@ typedef struct OutputStream { AVStream *st; /* stream in the output file */ - AVRational enc_timebase; - Encoder *enc; AVCodecContext *enc_ctx; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 5f2dbc387e..0b78898af0 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -780,7 +780,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->flags = opts->flags; ofp->ts_offset = opts->ts_offset; - ofp->enc_timebase = ost->enc_timebase; + ofp->enc_timebase = opts->output_tb; switch (ost->enc_ctx->codec_type) { case AVMEDIA_TYPE_VIDEO: diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 8b03d3b108..28090423c6 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1042,6 +1042,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, const AVCodec *enc; AVStream *st; int ret = 0, keep_pix_fmt = 0; + AVRational enc_tb = { 0, 0 }; const char *bsfs = NULL, *time_base = NULL; char *filters = NULL, *next, *codec_tag = NULL; double qscale = -1; @@ -1260,7 +1261,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, #endif } - ost->enc_timebase = q; + enc_tb = q; } } else { ret = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, @@ -1377,6 +1378,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) { OutputFilterOptions opts = { .enc = enc, + .output_tb = enc_tb, .ts_offset = mux->of.start_time == AV_NOPTS_VALUE ? 0 : mux->of.start_time, .flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt,