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 DC35F4D1D3 for ; Tue, 18 Feb 2025 13:09:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F9FF68C1EB; Tue, 18 Feb 2025 15:08:48 +0200 (EET) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5236368C155 for ; Tue, 18 Feb 2025 15:08:44 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-220d398bea9so75138255ad.3 for ; Tue, 18 Feb 2025 05:08:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739884122; x=1740488922; 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=OuxLj1yIHbBSDoubJ+ZcqLIf0M1t/hFdEdPiwNTWei8=; b=F7WNRE1EFKYdjbegUJzh0DxGcyO4rHgKh982JX6lJRh9NmJTK1mUEbkMIPjGfkcWkD l0lIQpRetJ4G3JJTF10MKEczknY2Gd1+zf7KVRwNaLTGvmsp+H/40oFvQ8KQfYyaBRDJ 7f7OcQIk8Ut8lvp3pNmbmehFEQU7Jky7ec3Ttfp1Zk1RriQMM2T1gwBi6NklLG0gIX6v 6WkJrav86Pn5QAzjkJQyodEjzDGyhEnAldkC0mwQ3ui1Go56F4K4q4gf+TvwKCQArDFw jjX5IapswvNM0ybua41LxKeaJmILpYc+yTCYC+o3Xplt14gRYv+GHP0tXEvJwdaBJ0JK DxyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739884122; x=1740488922; 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=OuxLj1yIHbBSDoubJ+ZcqLIf0M1t/hFdEdPiwNTWei8=; b=QbKkg7IfibCehzAkf9XqL2rvF0SeRJ6pYWMu+7jrLW3Fs8CWArITZlQjjQ7XrdanNn KGmoC1V4roaY2wph80eyuSXiwKMstVL9260uMO4unZeAB2EU/vpQugEOGz9fbkSDHhRT uo8hP843oXK9kiCErbBSdpdgOz3l2LqyVrDv7Q7KoLqU6Ag9GfeMP3E318HcmPf1J1oZ N9PhlVIsMnv0OeL3afqBrjnUP89ygsa0+UjNxS4qMvVHntCAxS3bev6vXL3BigRQxhQ6 8jiy7sDPkz0xUOFow4rpxsQDCiRXIvaJ/wgcyqus7vqZihPPS44OPt1fIZ7AUZXZFrBR Xh3Q== X-Gm-Message-State: AOJu0YxcdJfcxc3o+sZnHINdUW3h2qEk2JHcGW8nyzzvnzZb9vw0wERB bsLutUEwGGz2H1TPRuYcy4q9b7N6vO0wg+E5MrkJ7P64g5LqkiqXU0V+S+Ky X-Gm-Gg: ASbGnctIDlYF51KJB+vafkr2tRFvvCQS8+VxyA5NQKG/w3ERN2EP4L2rnTMvl56yzU7 +WSaJH3QTVWzeHREoZGwiCxfP86ZWK1dJv6o9BaDzwljWXxVM/FwsF/dOfOKNECzfAWCbO+0LYV VnjmXdUWNMqI3ayliv8asiMJxT7mT/YOPadPMsZ1drMrfkU7c2zXgyLWGLcFsv3mcb0yO+//+jv nqs+MvMKiLu2MOhve6BTXbrNSzm5mJTbZbak0L6PtU+5hYTLfYfpvDEMYpMcHirXNrPAnwhXwjR lXp9MdwKr0L53PC2Qb6OZM5A6gZPwQ== X-Google-Smtp-Source: AGHT+IEiw523f/CWYWe1LCFpDPUiMIQQSSV0xPNFmw4m2eDR+bOwLZN3H+S7tjOnTD1XyJSgIB/dXA== X-Received: by 2002:a17:902:d4d0:b0:21f:6dca:6932 with SMTP id d9443c01a7336-221040d819dmr229544705ad.43.1739884122205; Tue, 18 Feb 2025 05:08:42 -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.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 05:08:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2025 10:08:11 -0300 Message-ID: <20250218130813.74-9-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 09/11] fftools/ffmpeg_enc: split off encoder flushing in encoder_thread() 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 | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 8e68831ee8..acb0702385 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -862,6 +862,19 @@ fail: return AVERROR(ENOMEM); } +static int flush_encoder(OutputStream *ost, EncoderThread *et) +{ + Encoder *e = ost->enc; + int ret; + + ret = frame_encode(ost, NULL, et->pkt); + if (ret < 0 && ret != AVERROR_EOF) + av_log(e, AV_LOG_ERROR, "Error flushing encoder: %s\n", + av_err2str(ret)); + + return ret; +} + int encoder_thread(void *arg) { OutputStream *ost = arg; @@ -927,12 +940,8 @@ int encoder_thread(void *arg) } // flush the encoder - if (ret == 0 || ret == AVERROR_EOF) { - ret = frame_encode(ost, NULL, et.pkt); - if (ret < 0 && ret != AVERROR_EOF) - av_log(e, AV_LOG_ERROR, "Error flushing encoder: %s\n", - av_err2str(ret)); - } + if (ret == 0 || ret == AVERROR_EOF) + ret = flush_encoder(ost, &et); // EOF is normal thread termination if (ret == AVERROR_EOF) -- 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".