From patchwork Tue Jun 20 14:16:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42246 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1428037pzb; Tue, 20 Jun 2023 07:18:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7qc6A6rpX/zfpFCGXgMhX91aGxSkXmzKOjzzr7V63AO7i2HPd2Eu89susoISqY6vCiEIlg X-Received: by 2002:a17:907:da2:b0:988:e8e1:6367 with SMTP id go34-20020a1709070da200b00988e8e16367mr3619734ejc.54.1687270703829; Tue, 20 Jun 2023 07:18:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687270703; cv=none; d=google.com; s=arc-20160816; b=nM3xTxC4/Ha5hBgKjSWSAGi4Do++3hwcit+5Isrduyo72NF5iGAQhj30FiC+Ea0I9a Wrr79a1mavX6wYCmkuYjfCQnv1r7bRXo4ryMPiGMt+F4AkMPZlx+o5C7Jocs6chRsWgU zKvmm08SaC5O7HE7eUchgEtK/1sheowssEdO+c8XGZlz/GCbLNQHDOUJKhsjnQTqbFzm dTZmBWMTWPWnehPqMQjcYYMHZM78lBI3ny/j5pN6LvaDT6kwC80AwO+Gqxnkvay+6Mww QZWRmyAjASDS27diIe7N8hv1Sao66BuJ5+y3deZoUucwiZ8jVb1GQDP8Y/yWA7BuuwBP jV9Q== 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=nBVFE+yurCHUnK6Q5aC+VYUro9kJRbzpn7NjPk7BOd8=; b=N3UgNbvf1xSRhJO1HQAmKcPVSyjwfBc6gjIQE1xcq470sgIAKHg7RoSygW2BiGJ3Mz gfsNbVOQc7f3x/lCTKBOYSnILZ0XNEIUaYMUTJvcqg8nSWi5o4N0RxP6oFNo44EbHmRB 913ci+O1hv+UU3EO9UXSP5gkYd1C1HnC7+Cc9I8Ls+9tGywh+mNX3RSs3ua/p0eJzLcf 7pWYmL+1yvfxzXxrDfYqeu3er6RUCTZUsur/0h2/yrXKaC7rDnGwOtI/Jh6ysORGMCFL OzzcqCxVYho1FN2ckpXEi48WpaSTIDSv8pZ4mL3ojCCJ7f3CoN4wkTnNd1VypemUL8QH EQ7Q== 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 t26-20020a1709064f1a00b0098642e99c22si1169719eju.604.2023.06.20.07.18.17; Tue, 20 Jun 2023 07:18:23 -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 9CDA068C1D5; Tue, 20 Jun 2023 17:16:59 +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 D488868C18E for ; Tue, 20 Jun 2023 17:16:48 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3ABBF2405B5 for ; Tue, 20 Jun 2023 16:16:45 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id yZ8M0UWFI1gu for ; Tue, 20 Jun 2023 16:16:44 +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 D4C452404EC for ; Tue, 20 Jun 2023 16:16:43 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id DDFE93A1267 for ; Tue, 20 Jun 2023 16:16:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 16:16:04 +0200 Message-Id: <20230620141608.31759-5-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230620141608.31759-1-anton@khirnov.net> References: <20230620141608.31759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] lavc: add generic-encode-layer private data 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: b7Uno4w9O+yw Move AVCodecInternal.intra_only_flag to it, should should not be visible outside of encode.c. --- libavcodec/avcodec.c | 2 +- libavcodec/avcodec_internal.h | 1 + libavcodec/encode.c | 26 ++++++++++++++++++++++++-- libavcodec/internal.h | 13 ++++++------- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index ff251d2dae..21d1e42c10 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -152,7 +152,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avci = av_codec_is_decoder(codec) ? ff_decode_internal_alloc() : - av_mallocz(sizeof(AVCodecInternal)); + ff_encode_internal_alloc(); if (!avci) { ret = AVERROR(ENOMEM); goto end; diff --git a/libavcodec/avcodec_internal.h b/libavcodec/avcodec_internal.h index f52f91e07c..9b93ff3d81 100644 --- a/libavcodec/avcodec_internal.h +++ b/libavcodec/avcodec_internal.h @@ -54,5 +54,6 @@ void ff_decode_flush_buffers(struct AVCodecContext *avctx); void ff_encode_flush_buffers(struct AVCodecContext *avctx); struct AVCodecInternal *ff_decode_internal_alloc(void); +struct AVCodecInternal *ff_encode_internal_alloc(void); #endif // AVCODEC_AVCODEC_INTERNAL_H diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 6d0ef2be10..4273dceb31 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -33,6 +33,15 @@ #include "frame_thread_encoder.h" #include "internal.h" +struct EncodeContext { + /** + * This is set to AV_PKT_FLAG_KEY for encoders that encode intra-only + * formats (i.e. whose codec descriptor has AV_CODEC_PROP_INTRA_ONLY set). + * This is used to set said flag generically for said encoders. + */ + int intra_only_flag; +}; + int ff_alloc_packet(AVCodecContext *avctx, AVPacket *avpkt, int64_t size) { if (size < 0 || size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { @@ -372,7 +381,7 @@ static int encode_receive_packet_internal(AVCodecContext *avctx, AVPacket *avpkt } else ret = encode_simple_receive_packet(avctx, avpkt); if (ret >= 0) - avpkt->flags |= avci->intra_only_flag; + avpkt->flags |= avci->e->intra_only_flag; if (ret == AVERROR_EOF) avci->draining_done = 1; @@ -710,7 +719,7 @@ int ff_encode_preinit(AVCodecContext *avctx) avctx->rc_initial_buffer_occupancy = avctx->rc_buffer_size * 3LL / 4; if (avctx->codec_descriptor->props & AV_CODEC_PROP_INTRA_ONLY) - avctx->internal->intra_only_flag = AV_PKT_FLAG_KEY; + avctx->internal->e->intra_only_flag = AV_PKT_FLAG_KEY; if (ffcodec(avctx->codec)->cb_type == FF_CODEC_CB_TYPE_ENCODE) { avci->in_frame = av_frame_alloc(); @@ -803,3 +812,16 @@ void ff_encode_flush_buffers(AVCodecContext *avctx) if (avci->recon_frame) av_frame_unref(avci->recon_frame); } + +AVCodecInternal *ff_encode_internal_alloc(void) +{ + struct Dummy { + AVCodecInternal i; + EncodeContext e; + } *dummy = av_mallocz(sizeof(*dummy)); + if (!dummy) + return NULL; + dummy->i.e = &dummy->e; + + return &dummy->i; +} diff --git a/libavcodec/internal.h b/libavcodec/internal.h index b672092ac4..2f4aee8ecc 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -50,6 +50,7 @@ #endif typedef struct DecodeContext DecodeContext; +typedef struct EncodeContext EncodeContext; typedef struct AVCodecInternal { /** @@ -57,6 +58,11 @@ typedef struct AVCodecInternal { */ DecodeContext *d; + /** + * Generic decoding private data. + */ + EncodeContext *e; + /** * When using frame-threaded decoding, this field is set for the first * worker thread (e.g. to decode extradata just once). @@ -102,13 +108,6 @@ typedef struct AVCodecInternal { uint8_t *byte_buffer; unsigned int byte_buffer_size; - /** - * This is set to AV_PKT_FLAG_KEY for encoders that encode intra-only - * formats (i.e. whose codec descriptor has AV_CODEC_PROP_INTRA_ONLY set). - * This is used to set said flag generically for said encoders. - */ - int intra_only_flag; - void *frame_thread_encoder; /**