From patchwork Tue Jun 20 14:16:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42245 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1427847pzb; Tue, 20 Jun 2023 07:18:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6FcTTRoLA6PVku7T0L4gJHGXIU06ZUqCsb7F00nViH0ckCbFBh+gVSLdj3OAqQSEBI9MnK X-Received: by 2002:a17:907:9718:b0:977:d48f:97ad with SMTP id jg24-20020a170907971800b00977d48f97admr14078375ejc.75.1687270687442; Tue, 20 Jun 2023 07:18:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687270687; cv=none; d=google.com; s=arc-20160816; b=CqfQuW1r80A/PtaumQm8HkyWpSNRHSFLSzxg6/vGuzmRy4zMhbIMxI+DOb5+kr5tdF HxOUgJnDZ+KLRZxcAKrcrdEGrOIeiVakqLgzKyJikZSiiv5wYeKj1p7j10+3pkBJzo5N fwYvPiypzM0QfNXH1Z6URR9hsmjgR/MMWWZv4lMToWE4JuUR/QXpGPy9zNdeNBSWGQdY bf5JLvnxXDcjfPe0kk4SxGCqxLpQFpX5az0gom7CjoHXcCV2TK/lCGSyksXrfP0jwJdH kktpcppT+DWElaUbktyWYpBSA85b52miA7w+DfIwsBaUwZxufIUnnAGO9SMrxxsHkWEZ 0HWA== 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=3i5ywN6S0ko6bzcEbpKfvRNxIhORU8+qvDSW1JRriKQ=; b=p53BcCnQGjicH1F/Ce5uFxl9Hn/TzsxVmEm9EHd3lw2KYoGuoHjy/HRfmsnlWKXouS CA4tg/oYUSYfj4LXvHDUZ6oBi+jUIShTIri7AaQEUwkS8f3D84z5pdf7AujbtBEriFGw e3IraT21X3bkA+n8AuL3vtO/3bqnFb4vZdi3YzH226AHT4CVrKJTsJpyZ9ynkF848T+Q MP6Jqi8MNjequnO1Xxcm9fvAhVjN3asm1wjPrUmY6csNB+Eqs/+dUVo0NtQqFUp7pSgX H+Qw4p1ipXXdpvuKyaeq3LjXK/PGuqw2PNXF5l85bHOFpsqG1dkBZ3hLXimRjEkiY1DY ORAA== 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 x22-20020a170906149600b00982a3765028si1428664ejc.477.2023.06.20.07.18.07; Tue, 20 Jun 2023 07:18:07 -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 9DFE068C1C2; Tue, 20 Jun 2023 17:16:58 +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 CF89768C18D for ; Tue, 20 Jun 2023 17:16:48 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id DD19A2405EC for ; Tue, 20 Jun 2023 16:16:44 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 7usjGBkwRVLX 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 C1BF52405B5 for ; Tue, 20 Jun 2023 16:16:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BAFE33A0616 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:01 +0200 Message-Id: <20230620141608.31759-2-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 2/9] lavc/avcodec: split flushing into decode- and encode-specific functions 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: ZNHqxgPGggrR Will allow making some state private to encoding/decoding in the future. --- libavcodec/avcodec.c | 26 ++------------------------ libavcodec/avcodec_internal.h | 3 +++ libavcodec/decode.c | 15 +++++++++++++++ libavcodec/encode.c | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 638cb55146..a5cb6035b6 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -373,33 +373,11 @@ void avcodec_flush_buffers(AVCodecContext *avctx) { AVCodecInternal *avci = avctx->internal; - if (av_codec_is_encoder(avctx->codec)) { - int caps = avctx->codec->capabilities; - - if (!(caps & AV_CODEC_CAP_ENCODER_FLUSH)) { - // Only encoders that explicitly declare support for it can be - // flushed. Otherwise, this is a no-op. - av_log(avctx, AV_LOG_WARNING, "Ignoring attempt to flush encoder " - "that doesn't support it\n"); - return; - } - if (avci->in_frame) - av_frame_unref(avci->in_frame); - if (avci->recon_frame) - av_frame_unref(avci->recon_frame); - } else { - av_packet_unref(avci->last_pkt_props); - av_packet_unref(avci->in_pkt); - - avctx->pts_correction_last_pts = - avctx->pts_correction_last_dts = INT64_MIN; - - av_bsf_flush(avci->bsf); - } + av_codec_is_encoder(avctx->codec) ? + ff_encode_flush_buffers(avctx) : ff_decode_flush_buffers(avctx); avci->draining = 0; avci->draining_done = 0; - avci->nb_draining_errors = 0; av_frame_unref(avci->buffer_frame); av_packet_unref(avci->buffer_pkt); diff --git a/libavcodec/avcodec_internal.h b/libavcodec/avcodec_internal.h index be60a36644..6ffe575c3e 100644 --- a/libavcodec/avcodec_internal.h +++ b/libavcodec/avcodec_internal.h @@ -50,4 +50,7 @@ int ff_encode_preinit(struct AVCodecContext *avctx); */ int ff_decode_preinit(struct AVCodecContext *avctx); +void ff_decode_flush_buffers(struct AVCodecContext *avctx); +void ff_encode_flush_buffers(struct AVCodecContext *avctx); + #endif // AVCODEC_AVCODEC_INTERNAL_H diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 8adb532616..7d000fec32 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1739,3 +1739,18 @@ AVBufferRef *ff_hwaccel_frame_priv_alloc(AVCodecContext *avctx, return ref; } + +void ff_decode_flush_buffers(AVCodecContext *avctx) +{ + AVCodecInternal *avci = avctx->internal; + + av_packet_unref(avci->last_pkt_props); + av_packet_unref(avci->in_pkt); + + avctx->pts_correction_last_pts = + avctx->pts_correction_last_dts = INT64_MIN; + + av_bsf_flush(avci->bsf); + + avci->nb_draining_errors = 0; +} diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 3a016b14c1..3341a79c9b 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -785,3 +785,21 @@ int ff_encode_receive_frame(AVCodecContext *avctx, AVFrame *frame) av_frame_move_ref(frame, avci->recon_frame); return 0; } + +void ff_encode_flush_buffers(AVCodecContext *avctx) +{ + AVCodecInternal *avci = avctx->internal; + int caps = avctx->codec->capabilities; + + if (!(caps & AV_CODEC_CAP_ENCODER_FLUSH)) { + // Only encoders that explicitly declare support for it can be + // flushed. Otherwise, this is a no-op. + av_log(avctx, AV_LOG_WARNING, "Ignoring attempt to flush encoder " + "that doesn't support it\n"); + return; + } + if (avci->in_frame) + av_frame_unref(avci->in_frame); + if (avci->recon_frame) + av_frame_unref(avci->recon_frame); +}