From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 9F3434D210 for ; Tue, 18 Feb 2025 13:10:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 686E868C21A; Tue, 18 Feb 2025 15:08:49 +0200 (EET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77EA068C155 for ; Tue, 18 Feb 2025 15:08:42 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-219f8263ae0so98138155ad.0 for ; Tue, 18 Feb 2025 05:08:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739884121; x=1740488921; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=f/EqDHNl1M8pvSbTnmKICXVw96tKzomvbOcwWBpiLHo=; b=Ojwk0PiTVK/e4RpZLAl+SkFdSdQmOP6YYllrs3Z+jktPMcJ3Wt+1HK93iaYE2gvgUj DIEO7BoTq82uzgZMKZMBaZmK2iqcbjYBAwNWujqiTQRsqOZmQCjwLd8Rn40tBOZuBqU/ u4SU2DI1g86dcccL5VkVYROZcRYc2K1Qg11BUmoBYSnvXmjMVr9uOpqWxGO0+G/f3cSG Gqok66fX3hBpSTkXm2N82cEdaQ/K8BPoqT6DDn2l88DncdnsK1ir52DHooNIbft/l2b3 3OAta8uUmQcx3kxuNULDmk2E9/MAp4o7D4nx+UCAcWBFRd+JtTtvAgfmT/7Vkc4ZzxRt +7Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739884121; x=1740488921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f/EqDHNl1M8pvSbTnmKICXVw96tKzomvbOcwWBpiLHo=; b=rDprpDC6oyvNh4xHbIDc+rnZT3bPkEqZEXT/7B6PjD6Ljz7NeDVQbGe5lpTAc+s0np h7y16+32guzBj12k8+Iz1TY/xPO4/zwFnTvMYgZoIDwK1ce5dtOua9GutkojK2cPa8Eb HiF/fwSDUlF6b6pnkYGci1jAjB/cGkvgDk6hSfXVJDk5xzemsLZw1uhCpunl3iP1T18y Sl87MyTR5xWQ6pLk+L0/6bJTmucl+/i+7HfLuuLyScz9I9BX4edc7ewk/0suF0F6Xfj/ yR9VfkfHMDsOvSnMbnKpcc+Cx+DdWqTFGoWNNzC1smYWwNRUPFrqapc7Jby03vhALueI QIbg== X-Gm-Message-State: AOJu0Ywk0qJnmrmgYBm/werBUs/WgMZKdtzv5JoaeVi1rLN97vwURFD2 EQHjefJh0+7oJUKbJmPOBStRNm8Dke6Il/s6rB72fYlFTjsYzNuVy+svDFbz X-Gm-Gg: ASbGncsJLzvIXdfBaTnc4JVGEAvw9JnCfywfis8g6xIB1uBQSJNbDWSnJBQknwFEQra 8bBDOoeyUVe2Usbabg/Ho29RYRkdxjLotKh358MJvyVCLctpJ1uioLSidOPcouiUjqgFAsfTHLp /cPJ1bK1qNAeYYdCHHMT9fVJohOkI2Qjy29yXmmazIK3FPoul7v57S2yu9Vb3six7HVes1jBclT Ue8kd3XBa5pi+LDD4Y3s1NVRmDChFHKTjgcFU11WvFmsdgWkQWpvgJJum2ODeJb9KO+xsopinry aAmAn5F9sUaVvvmvX9Hib4D6PB5OnA== X-Google-Smtp-Source: AGHT+IHtG1KQEVWkOBx+IcGVXcBOILuSXyjPYbOyzrEfmNCQpSgQ+IW7TWfO+1tsDc6rcD4j+gNzmA== X-Received: by 2002:a17:903:22c7:b0:21f:45b:6a4c with SMTP id d9443c01a7336-22103efb4f5mr194958395ad.7.1739884120710; Tue, 18 Feb 2025 05:08:40 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:a0a7:974:71c7:ca89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d556d66fsm89178635ad.180.2025.02.18.05.08.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 05:08:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2025 10:08:10 -0300 Message-ID: <20250218130813.74-8-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218130813.74-1-jamrial@gmail.com> References: <20250218130813.74-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] fftools/ffmpeg_enc: split off parts of enc_open() into a separate function 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Preparation work for the following commits. Signed-off-by: James Almer --- fftools/ffmpeg_enc.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index a46af4dce1..8e68831ee8 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -181,7 +181,7 @@ static int hw_device_setup_for_encode(Encoder *e, AVCodecContext *enc_ctx, return 0; } -int enc_open(void *opaque, const AVFrame *frame) +static int enc_reopen(void *opaque, const AVFrame *frame) { OutputStream *ost = opaque; InputStream *ist = ost->ist; @@ -190,14 +190,9 @@ int enc_open(void *opaque, const AVFrame *frame) AVCodecContext *enc_ctx = e->enc_ctx; Decoder *dec = NULL; const AVCodec *enc = enc_ctx->codec; - OutputFile *of = ost->file; FrameData *fd; - int frame_samples = 0; int ret; - if (ep->opened) - return 0; - // frame is always non-NULL for audio and video av_assert0(frame || (enc->type != AVMEDIA_TYPE_VIDEO && enc->type != AVMEDIA_TYPE_AUDIO)); @@ -343,14 +338,34 @@ int enc_open(void *opaque, const AVFrame *frame) ep->opened = 1; - if (enc_ctx->frame_size) - frame_samples = enc_ctx->frame_size; - if (enc_ctx->bit_rate && enc_ctx->bit_rate < 1000 && enc_ctx->codec_id != AV_CODEC_ID_CODEC2 /* don't complain about 700 bit/s modes */) av_log(e, AV_LOG_WARNING, "The bitrate parameter is set too low." " It takes bits/s as argument, not kbits/s\n"); + return 0; +} + +int enc_open(void *opaque, const AVFrame *frame) +{ + OutputStream *ost = opaque; + Encoder *e = ost->enc; + EncoderPriv *ep = ep_from_enc(e); + AVCodecContext *enc_ctx = e->enc_ctx; + OutputFile *of = ost->file; + int frame_samples = 0; + int ret; + + if (ep->opened) + return 0; + + ret = enc_reopen(opaque, frame); + if (ret < 0) + return ret; + + if (enc_ctx->frame_size) + frame_samples = enc_ctx->frame_size; + ret = of_stream_init(of, ost, enc_ctx); if (ret < 0) return ret; -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".