From patchwork Mon Mar 8 15:29:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26269 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 423B944AF6D for ; Mon, 8 Mar 2021 17:30:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B70468A831; Mon, 8 Mar 2021 17:30:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0C7F68A778 for ; Mon, 8 Mar 2021 17:30:35 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id jt13so21245457ejb.0 for ; Mon, 08 Mar 2021 07:30:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=+tZWipiY+kQaRauAikZRNmoU9KNM2yqvVUMXTchtKC8=; b=TW90E4Je144l21aUyRoP6o2Qmht6/7BvDjLjPPxc+WLPUjESsYa5pt9LzBIjXsga+v FtjWP0uftgNUSJJFmGGO0npK0/xQCUCPSLLD01AkiZ5vwwge68yvKMcSdLqelAHeZd1n U+HE/UMgUvpqJQkoxt6s9fofrRTxbygXtoWPKAd4GXZ3JlD2tZMluE8vvw7yMzAjpwIp kyGf+4yAYbVEuFYnw86vtIfJgqxnL9nFJkfwqJ61i8qEA19/O96waIjapy+T5FIrDuU0 9bHT98VsOj4Dzzmw7E6o2OpZvKbSQjiz3KuNsgRYUJLeXx7N8UbrdUI3cw/W8agBmBaV eEsw== 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:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=+tZWipiY+kQaRauAikZRNmoU9KNM2yqvVUMXTchtKC8=; b=AzaFa8xIIfTWbLzhQKp4Lv4URHeieCuy+GieYU9wVZrpvKX55pNAsFp5cyW+KGM6uW jlnnHvjUZgSbsvQE/E5arqPPBKikHpVWQrU5cugVne0K8+vuM0CCBjmjXlsP3aYkTlDB YzB9YeFX9+DMsLfMr1ufWOoEhZqCZCP/P/j17ghHR76KvknMDgU4zjez7HITupjl/jSj Q0Rl4eddNZb/BT7Lgktnk4L8rd0e4IeMPgHQrx5zoPyg0hPFw8k36xXGiKkqxu9lXBeX RLHMWzSXDaGySi5CiRXPWSKIkyrrcI9JXXgD8TO5OZR/js6GYdIb5Q2Ln5aZixsdb5YG yYHw== X-Gm-Message-State: AOAM531n3t+M8zKdkTcLs3WnIFuYn4tDs4G0vjkMhS5UiW6M5oBxPvWs sIlcTS4RN7aQaL9gXIF/XMldoJVmC6E= X-Google-Smtp-Source: ABdhPJyDS2Mbh8vW7p2mzgHrqqUaFd2IdcxGeO8EOEI0w8BVqrXraInRSy+qWQRnJ1byOn3KykgAUw== X-Received: by 2002:a17:906:b286:: with SMTP id q6mr15804909ejz.422.1615217435255; Mon, 08 Mar 2021 07:30:35 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lk12sm6665296ejb.14.2021.03.08.07.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 07:30:34 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Mar 2021 16:29:54 +0100 Message-Id: <20210308152957.601419-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210308152957.601419-1-andreas.rheinhardt@gmail.com> References: <20210308152957.601419-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/ylc: Only use one temporary buffer 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" The effective lifetime of the buffer used to build the VLCs and the buffer containing the bitstream is disjoint, so that one can use a common buffer for both. Signed-off-by: Andreas Rheinhardt --- libavcodec/ylc.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index a200d04acd..6dc3e60fec 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -39,10 +39,8 @@ typedef struct YLCContext { VLC vlc[4]; uint32_t table[1024]; - uint8_t *table_bits; - uint8_t *bitstream_bits; - int table_bits_size; - int bitstream_bits_size; + uint8_t *buffer; + int buffer_size; BswapDSPContext bdsp; } YLCContext; @@ -312,17 +310,18 @@ static int decode_frame(AVCodecContext *avctx, if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) return ret; - av_fast_malloc(&s->table_bits, &s->table_bits_size, - boffset - toffset + AV_INPUT_BUFFER_PADDING_SIZE); - if (!s->table_bits) + av_fast_malloc(&s->buffer, &s->buffer_size, + FFMAX(boffset - toffset, avpkt->size - boffset) + + AV_INPUT_BUFFER_PADDING_SIZE); + if (!s->buffer) return AVERROR(ENOMEM); - memcpy(s->table_bits, avpkt->data + toffset, boffset - toffset); - memset(s->table_bits + boffset - toffset, 0, AV_INPUT_BUFFER_PADDING_SIZE); - s->bdsp.bswap_buf((uint32_t *) s->table_bits, - (uint32_t *) s->table_bits, + memcpy(s->buffer, avpkt->data + toffset, boffset - toffset); + memset(s->buffer + boffset - toffset, 0, AV_INPUT_BUFFER_PADDING_SIZE); + s->bdsp.bswap_buf((uint32_t *) s->buffer, + (uint32_t *) s->buffer, (boffset - toffset + 3) >> 2); - if ((ret = init_get_bits8(&gb, s->table_bits, boffset - toffset)) < 0) + if ((ret = init_get_bits8(&gb, s->buffer, boffset - toffset)) < 0) return ret; for (x = 0; x < 1024; x++) { @@ -345,17 +344,12 @@ static int decode_frame(AVCodecContext *avctx, if (ret < 0) return ret; - av_fast_malloc(&s->bitstream_bits, &s->bitstream_bits_size, - avpkt->size - boffset + AV_INPUT_BUFFER_PADDING_SIZE); - if (!s->bitstream_bits) - return AVERROR(ENOMEM); - - memcpy(s->bitstream_bits, avpkt->data + boffset, avpkt->size - boffset); - memset(s->bitstream_bits + avpkt->size - boffset, 0, AV_INPUT_BUFFER_PADDING_SIZE); - s->bdsp.bswap_buf((uint32_t *) s->bitstream_bits, - (uint32_t *) s->bitstream_bits, + memcpy(s->buffer, avpkt->data + boffset, avpkt->size - boffset); + memset(s->buffer + avpkt->size - boffset, 0, AV_INPUT_BUFFER_PADDING_SIZE); + s->bdsp.bswap_buf((uint32_t *) s->buffer, + (uint32_t *) s->buffer, (avpkt->size - boffset) >> 2); - if ((ret = init_get_bits8(&gb, s->bitstream_bits, avpkt->size - boffset)) < 0) + if ((ret = init_get_bits8(&gb, s->buffer, avpkt->size - boffset)) < 0) return ret; dst = p->data[0]; @@ -461,10 +455,8 @@ static av_cold int decode_end(AVCodecContext *avctx) ff_free_vlc(&s->vlc[1]); ff_free_vlc(&s->vlc[2]); ff_free_vlc(&s->vlc[3]); - av_freep(&s->table_bits); - s->table_bits_size = 0; - av_freep(&s->bitstream_bits); - s->bitstream_bits_size = 0; + av_freep(&s->buffer); + s->buffer_size = 0; return 0; }