From patchwork Sat Aug 1 13:47:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21434 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 B2E4E44AA8D for ; Sat, 1 Aug 2020 16:49:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BCD868BAB2; Sat, 1 Aug 2020 16:49:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCD8A68BA9A for ; Sat, 1 Aug 2020 16:49:41 +0300 (EEST) Received: by mail-ed1-f45.google.com with SMTP id c15so14551917edj.3 for ; Sat, 01 Aug 2020 06:49:41 -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=UIh9WCxwtu1ND6rdAM17z7VQ4MpwD4AlUR8QVAQG+Ic=; b=mrGuMOnZVG7DBIWed2bOB7EcnLYmx04wQvSuq+6RR4L1NcYrBuXikRQRjmrK1msXBE zeKAaHWCrXSBW//yWncEchT8pRAd5pyQe8kHr3HXqtYBMjbIUgZPD3ljv0RUaDcyMoVT KR83U3t2jsovBqAb1XI8jtxnGKM9h1Znzm832Gp3mWG3KU5SwJ1dXGCjcTCzWxCuZ6QM VcQpC9+pwbYtLFCPSP3Vcg54QBo/aQlT8RBgaTvha0EBUQfDXUayp0kBTtF+mlPkTj8D qrvNkUFiU7SGdBX8plJ9pP+3sEj1GU2vVX6mARDcEefP65yNoy7l3EzisQsZuqZ67F0w XdcQ== 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=UIh9WCxwtu1ND6rdAM17z7VQ4MpwD4AlUR8QVAQG+Ic=; b=Sr9roZ1AKFL6qSCIFRlPjFTt6fdNVpzGKkzvT4wLnV6J9SvIAvKz/mY2my/bLbTUVM X/nG76/vpCd83m3ivGOGaeOI8ZFnMYKqRG2wlfYFMbZ4xjDiFPaQggwX2m09uYdXbthP n/Hk5egZakTeDDbdirpNkW7TQvu+HUnjGFkOhHa87aDDrdcKY7oKnNmV2WbK06J1SCC9 t11YBkmvLN1GMeVQaRVppQVxncZ912FfWex3qKpaUB2P325wEn/e39Hve6fSiEKErX0m 0relFJn4hsxCLT7zMOLA2+1XPMcnAgmEY8E5k9tvxNyzU/iXZq8rKlJID8LR9+Jzlgb4 iSsw== X-Gm-Message-State: AOAM533tS3y7+Qp0bhR/PkGc+h2Dqka4+9xZDmWnlcZFP8JDZD/q2qNf msJRM/hhIuz0mEcx+ydZ3HgwwIRd X-Google-Smtp-Source: ABdhPJxlTJuuFYX6B5nLPVAiw3bvch5zm8/t809SwpyNLjejQr/wb+NUu7JjiAalpt5AJNdpo42QkQ== X-Received: by 2002:a05:6402:308e:: with SMTP id de14mr8118972edb.344.1596289780652; Sat, 01 Aug 2020 06:49:40 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id b24sm12178501edn.33.2020.08.01.06.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 06:49:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Aug 2020 15:47:04 +0200 Message-Id: <20200801134704.3647-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> References: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/21] avcodec/smacker: Avoid code duplication 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" Besides the obvious advantage of less code this also has a performance impact: For GCC 9 the time spent on one call to smka_decode_frame() for the sample from ticket #2425 decreased from 1693619 to 1498127 decicycles. For Clang 9, it decreased from 1369089 to 1366465 decicycles. Signed-off-by: Andreas Rheinhardt --- The numbers for GCC surprised me (as did the fact that GCC was so much worse than Clang). libavcodec/smacker.c | 62 ++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index d2b1c68162..ffd24c11e7 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -671,37 +671,23 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, for(i = 0; i <= stereo; i++) *samples++ = pred[i]; for(; i < unp_size / 2; i++) { + unsigned idx = 2 * (i & stereo); if (get_bits_left(&gb) < 0) { ret = AVERROR_INVALIDDATA; goto error; } - if(i & stereo) { - if(vlc[2].table) - res = get_vlc2(&gb, vlc[2].table, SMKTREE_BITS, 3); - else - res = values[2]; - val = res; - if(vlc[3].table) - res = get_vlc2(&gb, vlc[3].table, SMKTREE_BITS, 3); - else - res = values[3]; - val |= res << 8; - pred[1] += val; - *samples++ = pred[1]; - } else { - if(vlc[0].table) - res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3); - else - res = values[0]; - val = res; - if(vlc[1].table) - res = get_vlc2(&gb, vlc[1].table, SMKTREE_BITS, 3); - else - res = values[1]; - val |= res << 8; - pred[0] += val; - *samples++ = pred[0]; - } + if (vlc[idx].table) + res = get_vlc2(&gb, vlc[idx].table, SMKTREE_BITS, 3); + else + res = values[idx]; + val = res; + if (vlc[++idx].table) + res = get_vlc2(&gb, vlc[idx].table, SMKTREE_BITS, 3); + else + res = values[idx]; + val |= res << 8; + pred[idx / 2] += val; + *samples++ = pred[idx / 2]; } } else { //8-bit data for(i = stereo; i >= 0; i--) @@ -709,25 +695,17 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, for(i = 0; i <= stereo; i++) *samples8++ = pred[i]; for(; i < unp_size; i++) { + unsigned idx = i & stereo; if (get_bits_left(&gb) < 0) { ret = AVERROR_INVALIDDATA; goto error; } - if(i & stereo){ - if(vlc[1].table) - res = get_vlc2(&gb, vlc[1].table, SMKTREE_BITS, 3); - else - res = values[1]; - pred[1] += res; - *samples8++ = pred[1]; - } else { - if(vlc[0].table) - res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3); - else - res = values[0]; - pred[0] += res; - *samples8++ = pred[0]; - } + if (vlc[idx].table) + val = get_vlc2(&gb, vlc[idx].table, SMKTREE_BITS, 3); + else + val = values[idx]; + pred[idx] += val; + *samples8++ = pred[idx]; } }