From patchwork Sun Mar 21 09:47:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26509 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A3D45449A95 for ; Sun, 21 Mar 2021 11:47:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7CDBF68A831; Sun, 21 Mar 2021 11:47:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D6E168A688 for ; Sun, 21 Mar 2021 11:47:34 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id x13so13540188wrs.9 for ; Sun, 21 Mar 2021 02:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=SjYJWjrxbaGxKc3ZAmBha973JQ1h5r0TF2qtoTGQMvc=; b=GodGMCFHpidJfLIl8rG18Mf75DMM04SY+TTYjvK8GQiM1IX7LRe3wQkLTnK57p1SOo URGTQYMdtKCQag+8kaxd4Glb0TzL7xP6D+H1v8klRwrJ5ziWR/6rJZryo9Xmhag7UF4R c/C/RNPqRut8lvaQ37ujg5k1fpK/YIh9zyvsSJ0Csx3Mx4QQMUxH3sSUpu1dRvXcRDcA VmxZ4GFq6ku5AZh0PJ1Dv0zuX+Rg9zkqaEPuQuRlWMkKfXfgLGCHaTYX26e0t/9laqys Xr9hbexmVEMNlDmrJ1aHJT/5+/qbQOYZ9W4ra9ehazVX97UkSpavTEdQiQ/7Q2GmhMyO YFyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=SjYJWjrxbaGxKc3ZAmBha973JQ1h5r0TF2qtoTGQMvc=; b=eir4AGTI0FFPlQmuT3CT/w2C0cej+cmvaimnJMrP4sD7ZCdIBewFjKp4KAfNK55X8G m0WBmA+U+QKZe+un/oyy+BsI/a+7J1PLMvTnN30csvkt3zbsqEDSave2uibNDOrPUjtj xOjG7oe8C3UU/B1TZfGHwioNvnXhfaezp2z5FGbYmMtA0FQZ0iXtG38okPULt+FIxsxA hvd/3Yl28q717hwPtT4TI6ANfRQ+81+Zt/Lk4UqipdDish8zeef1OsgmYrIAX7rYg+ag JmCWWad8Owyd0+suialyzNmSLsYgOMOXqN5q460LWak4s07u7WZPAVme9A9QhuispvzP Ls6A== X-Gm-Message-State: AOAM530C+IK4A7XEUSOWH2kh/cny1363saHaKmT4Bvm5EqbniAr/5MNt x0v6cFhAA7uPmfqky105j6heYXxOTa/1vQ== X-Google-Smtp-Source: ABdhPJww4KuUBFrp2wAJ8aMuPNNoY0SB0dBby0sCLtpNeEi0gHn+Sk5ImWh8DNuyYczkTsE0nGu//w== X-Received: by 2002:a5d:6a81:: with SMTP id s1mr13145939wru.401.1616320053651; Sun, 21 Mar 2021 02:47:33 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id m14sm11649387wmi.27.2021.03.21.02.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 02:47:33 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Mar 2021 10:47:18 +0100 Message-Id: <20210321094722.447294-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/avcodec: Use dedicated pointer to access AVCodecInternal X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 48 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 2f3896dcc4..3088d2ff3f 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -527,45 +527,47 @@ av_cold int avcodec_close(AVCodecContext *avctx) return 0; if (avcodec_is_open(avctx)) { + AVCodecInternal *avci = avctx->internal; + if (CONFIG_FRAME_THREAD_ENCODER && - avctx->internal->frame_thread_encoder && avctx->thread_count > 1) { + avci->frame_thread_encoder && avctx->thread_count > 1) { ff_frame_thread_encoder_free(avctx); } - if (HAVE_THREADS && avctx->internal->thread_ctx) + if (HAVE_THREADS && avci->thread_ctx) ff_thread_free(avctx); if (avctx->codec && avctx->codec->close) avctx->codec->close(avctx); - avctx->internal->byte_buffer_size = 0; - av_freep(&avctx->internal->byte_buffer); + avci->byte_buffer_size = 0; + av_freep(&avci->byte_buffer); #if FF_API_OLD_ENCDEC - av_frame_free(&avctx->internal->to_free); - av_frame_free(&avctx->internal->compat_decode_frame); - av_packet_free(&avctx->internal->compat_encode_packet); + av_frame_free(&avci->to_free); + av_frame_free(&avci->compat_decode_frame); + av_packet_free(&avci->compat_encode_packet); #endif - av_frame_free(&avctx->internal->buffer_frame); - av_packet_free(&avctx->internal->buffer_pkt); - av_packet_unref(avctx->internal->last_pkt_props); - while (av_fifo_size(avctx->internal->pkt_props) >= - sizeof(*avctx->internal->last_pkt_props)) { - av_fifo_generic_read(avctx->internal->pkt_props, - avctx->internal->last_pkt_props, - sizeof(*avctx->internal->last_pkt_props), + av_frame_free(&avci->buffer_frame); + av_packet_free(&avci->buffer_pkt); + av_packet_unref(avci->last_pkt_props); + while (av_fifo_size(avci->pkt_props) >= + sizeof(*avci->last_pkt_props)) { + av_fifo_generic_read(avci->pkt_props, + avci->last_pkt_props, + sizeof(*avci->last_pkt_props), NULL); - av_packet_unref(avctx->internal->last_pkt_props); + av_packet_unref(avci->last_pkt_props); } - av_packet_free(&avctx->internal->last_pkt_props); - av_fifo_freep(&avctx->internal->pkt_props); + av_packet_free(&avci->last_pkt_props); + av_fifo_freep(&avci->pkt_props); - av_packet_free(&avctx->internal->ds.in_pkt); - av_frame_free(&avctx->internal->es.in_frame); + av_packet_free(&avci->ds.in_pkt); + av_frame_free(&avci->es.in_frame); - av_buffer_unref(&avctx->internal->pool); + av_buffer_unref(&avci->pool); if (avctx->hwaccel && avctx->hwaccel->uninit) avctx->hwaccel->uninit(avctx); - av_freep(&avctx->internal->hwaccel_priv_data); + av_freep(&avci->hwaccel_priv_data); - av_bsf_free(&avctx->internal->bsf); + av_bsf_free(&avci->bsf); av_freep(&avctx->internal); }