From patchwork Thu Mar 25 15:49:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26599 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 5CD3944B722 for ; Thu, 25 Mar 2021 17:50:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40AF568AAD5; Thu, 25 Mar 2021 17:50:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73D5A68AA89 for ; Thu, 25 Mar 2021 17:50:33 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id u21so3657328ejo.13 for ; Thu, 25 Mar 2021 08:50:33 -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:reply-to :mime-version:content-transfer-encoding; bh=zVFIwzQgcjRy9of+XaQohlkvWes/jS8cst5HnOZjqUI=; b=Ki0TcEk2i7omfz8dpf26nr1zbcKihaohlH4u+Tdi0MIv8RbN822avSyUe0bk7HaaJy enCNKmHUM0y0ZFSzHG7FA4SsWZ2AFaoAajsPI0bY457AfE+QzqIY8AEyXjgVO/OKLIee EFMss/urGg29/cmRRHfYsDdOzYbGATf2+gPHJT3oAp1VYhJcHd4HBrZd4cQ7tciq0tj/ S1CdaYdvb4AEPDjlk/wcFSZSSUpHWpXoQPmU4WJnlMiGpTMAlnooD0vxlVP73To/uR/n NSw9TGW0/Ae1hPNnUhjjx2Wyw9TfhY5tLnVlSjM6lGdf46VSlL5l2BqcGusPU+SWtmIJ T/QA== 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=zVFIwzQgcjRy9of+XaQohlkvWes/jS8cst5HnOZjqUI=; b=XYKFqUcXfxTy82LOzBOq7biTa1t+51WmItR3yNJ8OfvEeJ4hm+amMcYHGIU0Kg8ivh 6zRFPTAMgIm0yugRN9M3BMX1/yUdauNf6ozPnzVq+vYN2hyvmNKUzoZsWtgg3olY839R ZyO4AvHQSBWP66tfXl5oiuRmStftMOxqdrhFqGYWCllOPgB6HaZ2byfJeA/WfIILyn68 uDQacQJMmXGdtOo4MfoNnCMtr/OiZ5Ed+Rx9/tKIhZvQafmujfkYRku0tgQ8nkKZOo7I OmEUJ5u8sRhfzLiiXZQE337gmWiWcVNlo6MSw2Lvo6Rxtgn/xIJvKmJe3zISW3KyVkwA hx5w== X-Gm-Message-State: AOAM532XPuWKjinSK+WhiinY5dscqAqPkaSHnJo9U14T07kmDgtqz/y5 jizK1g/9OKfTprc7jOr/Hg6R/EVQpaKY/Q== X-Google-Smtp-Source: ABdhPJz2N8DoMiIIlylIeZX+u6v0gWWd+L419BOvM5ozpMru6i/utTz52zCz7wAoW4bbbrCBZL7tGQ== X-Received: by 2002:a17:906:5e4a:: with SMTP id b10mr10256842eju.116.1616687432656; Thu, 25 Mar 2021 08:50:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id o6sm2859103edw.24.2021.03.25.08.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 08:50:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Mar 2021 16:49:47 +0100 Message-Id: <20210325154956.2405162-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210325154956.2405162-1-andreas.rheinhardt@gmail.com> References: <20210325154956.2405162-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/12] avcodec/mlpenc: Avoid redundant temporary PutBitContext 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" We are already word-aligned here, so one can just as well flush the main PutBitContext. Signed-off-by: Andreas Rheinhardt --- libavcodec/mlpenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 9782cb8261..40db76f350 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -1067,7 +1067,7 @@ static uint8_t *write_substrs(MLPEncodeContext *ctx, uint8_t *buf, int buf_size, RestartHeader *rh = &ctx->restart_header [substr]; int substr_restart_frame = restart_frame; uint8_t parity, checksum; - PutBitContext pb, tmpb; + PutBitContext pb; int params_changed; ctx->cur_restart_header = rh; @@ -1117,9 +1117,9 @@ static uint8_t *write_substrs(MLPEncodeContext *ctx, uint8_t *buf, int buf_size, put_bits(&pb, 32, END_OF_STREAM); } - /* Data must be flushed for the checksum and parity to be correct. */ - tmpb = pb; - flush_put_bits(&tmpb); + /* Data must be flushed for the checksum and parity to be correct; + * notice that we already are word-aligned here. */ + flush_put_bits(&pb); parity = ff_mlp_calculate_parity(buf, put_bits_count(&pb) >> 3) ^ 0xa9; checksum = ff_mlp_checksum8 (buf, put_bits_count(&pb) >> 3);