From patchwork Fri Jun 26 20:28:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20635 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 CEC2844BE0F for ; Fri, 26 Jun 2020 23:36:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7BB368B119; Fri, 26 Jun 2020 23:36:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C77468B029 for ; Fri, 26 Jun 2020 23:36:47 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id f18so10531561wml.3 for ; Fri, 26 Jun 2020 13:36:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=hHNipj53AavQgHfjC8AGTV4/EKLTrs2XUkALOd7HxG0=; b=WheRhgv5Niq6NlfJOpnS8c88kl87VgK8j4zac8Q0aMkQO5GsNrXGCKzfSHn1jhlHxp I8TZ5oeXmpG3ifQdiLtXdsQteWTFBgucI9pdS+1HUHByvfwKCUkbNmf0E079zCRAFJrc 5U8SxEFRPCN5Z0R687qQmSnk1eRzjpkNn0MQKldOibK7RsD72FArNhTS0uiWktADe3Ih 3wtr9VxcRlc1IN4sonRrF4VcWm3mbta8MMFsUIm2nU2JMwzdRlJgH/Z1Fmt0jS+R4PHQ v5f4GGCY2lIdd6jwssDUxX537YtqvMFmg1zDqkpB7iG0Un89qKGWtRhvgOY/H0gEkIiE kDeg== 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:mime-version:content-transfer-encoding; bh=hHNipj53AavQgHfjC8AGTV4/EKLTrs2XUkALOd7HxG0=; b=fBzB0XpNSgiMjUgiiZWTxHIkweJzhiI9Py1hnyMKwB1iJY5Ymr2GzteIiFew0PWekx uuaYYB8Uuo5d1VhG7aSbqz0ETKxpfm7l6+cKIi5JvUAkjIF3RnKTSUgPiRDXpiKKPjFn rg5RoqJiZBB8HcwTA+PeCQFYukXtLcQwGzCE/8sOHFRrgbRH9ZNfv0r6rr4c6QKw0ldS qRclTJSPAbH5mpxCJOr2+eXCT3fpenC+78mwPoJwKfqroAvSkaLItzgX5sjfQrcmNsZh Fli64MIeuNdR74d7Eh5mR/457L8Ln1d9BE7/Z649A+IKu+EzRwxAuz+1Kw07yvdtoEwe Eg3Q== X-Gm-Message-State: AOAM531p6B9udF72TjGVFgzaklHmN5TsllEMC3PXsh05gEO912OYGlaq DhqkdF724K8VRVoKmpTPpqg05xz4 X-Google-Smtp-Source: ABdhPJwVXGrAoo8LLlhCA9HyOkZmMupJz0CFv7ZE2ZvDZMh+GJ+6o+df7CSKZGA1fKUcijzyvnSujQ== X-Received: by 2002:a1c:29c6:: with SMTP id p189mr2090148wmp.70.1593203328021; Fri, 26 Jun 2020 13:28:48 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id u8sm3519293wrt.28.2020.06.26.13.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 13:28:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jun 2020 22:28:21 +0200 Message-Id: <20200626202822.17751-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> References: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/bitstream: Avoid allocation when creating VLC tables 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/bitstream.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 53a2db7451..d379dbc0e8 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -285,7 +285,6 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, vlc->bits = nb_bits; if (flags & INIT_VLC_USE_NEW_STATIC) { av_assert0(nb_codes + 1 <= FF_ARRAY_ELEMS(localbuf)); - buf = localbuf; localvlc = *vlc_arg; vlc = &localvlc; vlc->table_size = 0; @@ -293,11 +292,13 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, vlc->table = NULL; vlc->table_allocated = 0; vlc->table_size = 0; - + } + if (nb_codes + 1 > FF_ARRAY_ELEMS(localbuf)) { buf = av_malloc_array((nb_codes + 1), sizeof(VLCcode)); if (!buf) return AVERROR(ENOMEM); - } + } else + buf = localbuf; av_assert0(symbols_size <= 2 || !symbols); @@ -309,7 +310,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, continue; \ if (buf[j].bits > 3*nb_bits || buf[j].bits>32) { \ av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\ - if (!(flags & INIT_VLC_USE_NEW_STATIC)) \ + if (buf != localbuf) \ av_free(buf); \ return AVERROR(EINVAL); \ } \ @@ -317,7 +318,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, if (buf[j].code >= (1LL<= 0); *vlc_arg = *vlc; } else { - av_free(buf); + if (buf != localbuf) + av_free(buf); if (ret < 0) { av_freep(&vlc->table); return ret;