From patchwork Fri Nov 20 07:33:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23910 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 1F85644AD6B for ; Fri, 20 Nov 2020 09:55:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0469B68BDD0; Fri, 20 Nov 2020 09:35:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D96868BD99 for ; Fri, 20 Nov 2020 09:35:03 +0200 (EET) Received: by mail-ej1-f66.google.com with SMTP id o21so11523888ejb.3 for ; Thu, 19 Nov 2020 23:35:03 -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=8vvS84SvE5tPZ/6wESk9s93w3eeMCie4nZBP4tIj8uM=; b=AeZie+pebqOcfXWbsu0ggWSvJC5bQ/6v96L80j6QbOkmu95TwvNRNg9YtxVAhcV50k Kh7y3R3cfFMzUDVAUCIGSBhfpsHkk+1QWQ4jb7ZuXfJsPMmxN1y4Ee68clHqMHQOadQ0 A8OsumdpGRc9vOU9sGOKFsm/5SzyByvQNrc07zFqzyQ6EBeXQnmZDY4qei9OpTE4CQhk 7WhFJIyg1XulwUNvG0hnh2aJl2QVU00Pvf6+5Zszb6CN0DiIhCCPipoy70KHy/HHzA5T pApI9n9FIuon/uSUHti/GIlHOgkKQZrDkC6/M52PVxMBa083wx3VgvHUcmk2k2ARenKd wW1g== 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=8vvS84SvE5tPZ/6wESk9s93w3eeMCie4nZBP4tIj8uM=; b=rwzhJ35PGOJlBM56PiTJ/loTSI9GA/VFBzZN114+R4jHoZff8K0DODRmHZmpXV+UZx haPmjAGPRBlwdFfxKbl9H+FZo+LR9i9k7xkvyILBc1u6EqdnfeGGCFqPCpnIO6cqatPs RNbfD5O6G5oMEna/lTIZLWx1bZkDC9QiXfllnVp6TR0B9GWCf5k0cwgSuqe5I1KFWgUI ZAg/Zwr0+YlAP+1junb8RdPH9Wq7DNtSWpMuDMQex4bnmyUQodVxdQGw2gBwVRv+vOAp PAJ6o7BDGfy2hc0Tzw9Sx8r8zznLs8tCUxeyfYitkafLtjIZHsnyHYATKE6+6+1I/OqK TwkQ== X-Gm-Message-State: AOAM533nJ83TmnbNB/3AwhXkYU4BkXG3iCj6AtGAuowwxgd6w713qfJ3 bdsQYNi1vgMzRvTDPlMPobvSFlcUDiJbuQ== X-Google-Smtp-Source: ABdhPJyUf2uNB1KzoPn77yTFrppXJLZA6VEw841HnbuqQQW02i3ECBBGwqhlSxysHc4EQ/iH1znxDw== X-Received: by 2002:a17:906:12cf:: with SMTP id l15mr33443859ejb.540.1605857702181; Thu, 19 Nov 2020 23:35:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:35:01 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:33:22 +0100 Message-Id: <20201120073327.820745-58-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 157/162] avcodec/mpegaudiodec_template: Apply shift during init 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/mpegaudiodec_template.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 1faaa0ae52..3fb09511bc 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -174,10 +174,10 @@ static void init_long_region(MPADecodeContext *s, GranuleDef *g, int ra1, int ra2) { int l; - g->region_size[0] = band_index_long[s->sample_rate_index][ra1 + 1] >> 1; + g->region_size[0] = band_index_long[s->sample_rate_index][ra1 + 1]; /* should not overflow */ l = FFMIN(ra1 + ra2 + 2, 22); - g->region_size[1] = band_index_long[s->sample_rate_index][ l] >> 1; + g->region_size[1] = band_index_long[s->sample_rate_index][ l]; } static void compute_band_indexes(MPADecodeContext *s, GranuleDef *g) @@ -327,7 +327,7 @@ static av_cold void decode_init_static(void) k = 0; for (j = 0; j < 22; j++) { band_index_long[i][j] = k; - k += band_size_long[i][j]; + k += band_size_long[i][j] >> 1; } band_index_long[i][22] = k; }