From patchwork Mon Jul 3 19:32:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp4589636pzh; Mon, 3 Jul 2023 12:34:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlHqE5U4Xa88Q3+8in7bDpOYs7PbU3pfEYiiiKKQBZO/XmLYyCG6OnnXP93by1LxMAVY4H4E X-Received: by 2002:a17:907:20a9:b0:988:699d:64d0 with SMTP id pw9-20020a17090720a900b00988699d64d0mr7785814ejb.32.1688412858745; Mon, 03 Jul 2023 12:34:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688412858; cv=none; d=google.com; s=arc-20160816; b=fJ3/WANRQ6Eml4s0A+ay8KS6OSNYvHNZG7Ioeh6eZAIaEdcWS3AB5rJSXSEFctjrCu egMMGQERTjM/jnn0gpc0+PP4tMHvxoOSt6hYVl21BqYm7F9N0cLlQWduqY68kvsbLf1q DYpPpJgj8hmgLD1JjaitAsaKx01noKqdK6flj9P5KgcYE4KR2UM5A8AwbCk0pEYAuHdB l6sv+kXL6wINecWGClqmzclpYqEJQKiMXHqzm4k2yxdyQX+yMyxrTke4gYJ1nq+2OriF 7OE8fdNuVR3kYtl93ivW7WyT5OAbOcoCH711siKIFm0iyUnw5WkvHEBzBKTyJnHNcezQ dwcA== 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=u04grFjjZmEryMdN9y9gCGXLNG2aIsUjFbXZvVVV1ug=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=TlaTts3rhmlC+2+1DtmlAuGZfdZcQWfxbD7EU3zjhVnFMy3GzQuIOniEOEGCURdl9K SSzzyO+IdcNN8aTW1aAHuYsO0cHH2Zp8UKdBvyQX0IKZVq54bAPSxc2TLVOKP11QFij8 CkpDEYeuRFCtYIpiheIr+u3pEP7VxQ8jGQjkuG+BsKVmviVOl6bfa/pHnaSBY9RNjXvK 8JauJ44ZYuarO0wG95KY2pZDm1A5GdsLnPoQBPys1BAY5j1y77V7pZOjECyPUf7KUxkE ybQ9IDI3bj85VzqQH6b8wSfW8fpITp0Hspbp5MK8zd8SS0qBGUHvJjap6UekOBeOR/kS oD0Q== 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 lr27-20020a170906fb9b00b00992437c5881si8052739ejb.198.2023.07.03.12.34.18; Mon, 03 Jul 2023 12:34: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; 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 34FD368C5D0; Mon, 3 Jul 2023 22:33:08 +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 7631568C5B0 for ; Mon, 3 Jul 2023 22:32:58 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E14642406CB for ; Mon, 3 Jul 2023 21:32:55 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id eAYGPR_sORhm for ; Mon, 3 Jul 2023 21:32:54 +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 1258A2405F9 for ; Mon, 3 Jul 2023 21:32:52 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id AE3513A168E for ; Mon, 3 Jul 2023 21:32:45 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jul 2023 21:32:25 +0200 Message-Id: <20230703193229.8593-7-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230703193229.8593-1-anton@khirnov.net> References: <20230703193229.8593-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 06/10] lavc: move AVCodecInternal.last_audio_frame to EncodeContext 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: zvdobik69Qf7 It does not need to be visible outside of encode.c. --- libavcodec/encode.c | 13 ++++++++++--- libavcodec/internal.h | 6 ------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 6da5d86ea0..58eab5b001 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -42,6 +42,12 @@ typedef struct EncodeContext { * This is used to set said flag generically for said encoders. */ int intra_only_flag; + + /** + * An audio frame with less than required samples has been submitted (and + * potentially padded with silence). Reject all subsequent frames. + */ + int last_audio_frame; } EncodeContext; static EncodeContext *encode_ctx(AVCodecInternal *avci) @@ -174,7 +180,7 @@ static int pad_last_frame(AVCodecContext *s, AVFrame *frame, const AVFrame *src, fail: av_frame_unref(frame); - s->internal->last_audio_frame = 0; + encode_ctx(s->internal)->last_audio_frame = 0; return ret; } @@ -446,6 +452,7 @@ static int encode_generate_icc_profile(av_unused AVCodecContext *c, av_unused AV static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) { AVCodecInternal *avci = avctx->internal; + EncodeContext *ec = encode_ctx(avci); AVFrame *dst = avci->buffer_frame; int ret; @@ -458,7 +465,7 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) /* check for valid frame size */ if (!(avctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) { /* if we already got an undersized frame, that must have been the last */ - if (avctx->internal->last_audio_frame) { + if (ec->last_audio_frame) { av_log(avctx, AV_LOG_ERROR, "frame_size (%d) was not respected for a non-last frame\n", avctx->frame_size); return AVERROR(EINVAL); } @@ -467,7 +474,7 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) return AVERROR(EINVAL); } if (src->nb_samples < avctx->frame_size) { - avctx->internal->last_audio_frame = 1; + ec->last_audio_frame = 1; if (!(avctx->codec->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME)) { int pad_samples = avci->pad_samples ? avci->pad_samples : avctx->frame_size; int out_samples = (src->nb_samples + pad_samples - 1) / pad_samples * pad_samples; diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 497cd77f23..868dd46b48 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -56,12 +56,6 @@ typedef struct AVCodecInternal { */ int is_copy; - /** - * An audio frame with less than required samples has been submitted (and - * potentially padded with silence). Reject all subsequent frames. - */ - int last_audio_frame; - /** * Audio encoders can set this flag during init to indicate that they * want the small last frame to be padded to a multiple of pad_samples.