From patchwork Fri Sep 4 23:17:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22108 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 E9CBF449193 for ; Sat, 5 Sep 2020 02:17:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D941368B50A; Sat, 5 Sep 2020 02:17:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE19668B4CF for ; Sat, 5 Sep 2020 02:17:51 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id e17so8239696wme.0 for ; Fri, 04 Sep 2020 16:17:51 -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=vQKtsQAbo39csEGhT8UgGXVOyPlCc1OekDrjKZoyfJ8=; b=t1wwk0Zmjt3ZXdIcDWuHjtM0Hjr3I0gAfjmzcNm0PmkH6faXkxnKZuUu4kDXeLyBTa J9IPTG3rcpnlvdmlbKp3UxEwtvOG2puqYqN/g+IySsurJY8sQRzVH0ODpZFQv0fVQUki 4gUNCNVw1H23khn1tnQXB6pjZ5aJGVpR+kaiPFQMZupkpil//KUcv+4Ovr8mCZrh6hmW FwpEFh/FEe+glY1am7skZsQZ4rJsp5PYhsVrIu37FGxkFWwZLHXGonGhCuYc8fn/39+L wcy+zNVSLlUSjWKTdawYwbnyaLRcBtRu7Q1s1hM2cHjUSheL9LCtvbXZ7zG6rX8GFfHn IwoQ== 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=vQKtsQAbo39csEGhT8UgGXVOyPlCc1OekDrjKZoyfJ8=; b=HSDLom4JFQ2Ui8a8VIPdc49lgS2dGaLQXgyd1cvwZKo7VDaPMAt3ZsfOl3CjXC/EXG ytA5oCvWgojz+5sITZOyYUs+/WjbsOPHAqkPRcPCvSx7B0PbsLRum1B97TgApnGjYEKm CSSk5jtkan41mUobm6yZnRfFSWSvm34qvIvHY0Id0dJ/m2faM7N0tzKlMv83fTCxVq+7 rLWdgz0hYz8d/fG7gjUTU3uYOY8NTVTdXBjtfP/LEbp4fxKYWoXq8jc635XFEe7X93F3 Kk+xpIBx9V0uh5v65+DOREguMQZFuMuOfqiN7VgSZXMqh1vxdp138fJdduC+ipJuojmV bGTQ== X-Gm-Message-State: AOAM531hzR03kE9ZDL/ICP2QpZDe8nJ+2a6tirgf7wTXaRVB3/GZ+QXW lkThudsJy5HSp0Bn0U/RBABFD0c7eOc= X-Google-Smtp-Source: ABdhPJzMv3FMYG0PjUef/qtGtnn97o/f+v1yYOoiSdbZzXiX5Q16AdiQUj9n8vtIBCNONwAwH0HazA== X-Received: by 2002:a7b:cb47:: with SMTP id v7mr9535600wmj.36.1599261470780; Fri, 04 Sep 2020 16:17:50 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f14sm14598098wrv.72.2020.09.04.16.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 16:17:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Sep 2020 01:17:14 +0200 Message-Id: <20200904231716.16182-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200904231716.16182-1-andreas.rheinhardt@gmail.com> References: <20200904231716.16182-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] avcodec/jpeglsenc: Avoid allocation of JLSState 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" This state is currently allocated and freed for every packet; but it can just be moved to the stack instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeglsenc.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index b1e54431e9..7fd109f0cf 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -279,7 +279,7 @@ static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt, uint8_t *buf2 = NULL; const uint8_t *in; uint8_t *last = NULL; - JLSState *state = NULL; + JLSState state = { 0 }; int i, size, ret; int comps; @@ -332,17 +332,13 @@ FF_ENABLE_DEPRECATION_WARNINGS bytestream2_put_byteu(&pb, (comps > 1) ? 1 : 0); // interleaving: 0 - plane, 1 - line bytestream2_put_byteu(&pb, 0); // point transform: none - state = av_mallocz(sizeof(JLSState)); - if (!state) - goto memfail; - /* initialize JPEG-LS state from JPEG parameters */ - state->near = ctx->pred; - state->bpp = (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8; - ff_jpegls_reset_coding_parameters(state, 0); - ff_jpegls_init_state(state); + state.near = ctx->pred; + state.bpp = (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8; + ff_jpegls_reset_coding_parameters(&state, 0); + ff_jpegls_init_state(&state); - ls_store_lse(state, &pb); + ls_store_lse(&state, &pb); last = av_mallocz(FFABS(p->linesize[0])); if (!last) @@ -354,7 +350,7 @@ FF_ENABLE_DEPRECATION_WARNINGS for (i = 0; i < avctx->height; i++) { int last0 = last[0]; - ls_encode_line(state, &pb2, last, in, t, avctx->width, 1, 0, 8); + ls_encode_line(&state, &pb2, last, in, t, avctx->width, 1, 0, 8); t = last0; in += p->linesize[0]; } @@ -363,7 +359,7 @@ FF_ENABLE_DEPRECATION_WARNINGS for (i = 0; i < avctx->height; i++) { int last0 = *((uint16_t *)last); - ls_encode_line(state, &pb2, last, in, t, avctx->width, 1, 0, 16); + ls_encode_line(&state, &pb2, last, in, t, avctx->width, 1, 0, 16); t = last0; in += p->linesize[0]; } @@ -375,7 +371,7 @@ FF_ENABLE_DEPRECATION_WARNINGS for (i = 0; i < avctx->height; i++) { for (j = 0; j < 3; j++) { int last0 = last[j]; - ls_encode_line(state, &pb2, last + j, in + j, Rc[j], + ls_encode_line(&state, &pb2, last + j, in + j, Rc[j], width, 3, j, 8); Rc[j] = last0; } @@ -389,7 +385,7 @@ FF_ENABLE_DEPRECATION_WARNINGS for (i = 0; i < avctx->height; i++) { for (j = 2; j >= 0; j--) { int last0 = last[j]; - ls_encode_line(state, &pb2, last + j, in + j, Rc[j], + ls_encode_line(&state, &pb2, last + j, in + j, Rc[j], width, 3, j, 8); Rc[j] = last0; } @@ -398,7 +394,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } av_freep(&last); - av_freep(&state); /* the specification says that after doing 0xff escaping unused bits in * the last byte must be set to 0, so just append 7 "optional" zero bits @@ -432,7 +427,6 @@ FF_ENABLE_DEPRECATION_WARNINGS memfail: av_freep(&buf2); - av_freep(&state); av_freep(&last); return AVERROR(ENOMEM); }