From patchwork Tue Jul 25 04:04:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4453 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp4992577vsb; Mon, 24 Jul 2017 21:05:24 -0700 (PDT) X-Received: by 10.223.128.42 with SMTP id 39mr18610238wrk.175.1500955524035; Mon, 24 Jul 2017 21:05:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500955523; cv=none; d=google.com; s=arc-20160816; b=YbXsKNp4EJ9tdKtYw2g9KZOM15+rzWYcI1fWnLbPzkFIl/SVIuUkdAj6pMaYUe2w5v RJXwTtOnRiRObTTH4bqMhVEmenydO+kQtXpec4Q80i0d8a3bt3FreyADTq0gmJ5o+Nhg sUJ8u1+xQmrjcqzqi31h9QKvYbncIGYxRaQTs2XbkW/pxv9kMrkm+S1U5XAkF2XJ5PZ9 XV/5JTB7ZOrjaECIMyQD6CowLGM3MRLmi85I7CzBm6rD3Ah81GDyY+RHvLZJrXNatbCl Yo7K992h3YZXBsGvxKFzqBdEpi4tuMOnN2cQEn11je+SVD/2GMz0noBKEmUF8rc/TPBO kQVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=hcWl6Gpbznr+R329AbQg1pCW5Yz0psw2uA9YfOv48to=; b=bIEJz5OyI/akebkHzY+7Nt8dGf61R1X+cDkQECUrlCH93xqUERp4eLvtnY17k/Wqeo E0i2hFoMh983jmOb4VBRBZUo6fbdwpEACRAwM+BTXy8ebIEjFm9ajW96H29XvZPZn1oL 9vVooR6pL6YOAaWiS+JBgbKLZWsqvXYKrQ1riB+8iynh1TycibiizI+SYd0zZO4IsbMu ms53+L1xuamuCdArqGSWrbZdaegsJHbMtSl412bCisdICArkiV34NjZ6X/2eq74WQ1/T R+Nafy5YSKJ53JNyX/vWoBJ6in5tt14LItMblrgThqWhfXvpanmffB+gjcN6EIiMbc7S uATw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=VGByVrCU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w20si10178686wrb.420.2017.07.24.21.05.23; Mon, 24 Jul 2017 21:05:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=VGByVrCU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 930E1689C4E; Tue, 25 Jul 2017 07:05:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20FAC689A54 for ; Tue, 25 Jul 2017 07:05:14 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id q66so11707082qki.1 for ; Mon, 24 Jul 2017 21:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=Rl6aekPVrRiqJoFxu/pYu878x0a8QryYDSXNwlhhy8A=; b=VGByVrCUc/bpgmnSQVlHzC9mq1o11oxPrMWEltIl37q+6bO0jKgZSqwmM9rVFx2RrQ Rf8lflo6d8NP+8rBydS42VEeq7xK7MHL6gogtP75BM7AMCil5MOP0M4dVu+mZxJWZUB8 T4mitLX3Mtsr8Mr2VQTfUhZvG9cXRgCt3s4mRsHv9G9H+tXbnx6keaaiTfjAeCK6hKaU MIk1Dj2ha+9xcN9+8aHJMZ/YE4tX87j2s34C95Jfc5tO/MyUs3oBvjFk5Ghtavw9weJQ dCJRgluWxZX/DO6W8axXuafX3wLLZ6w+cVTF/s19Q9evEzqj18fEs/OGBugVZQqWTTnM 6ivA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Rl6aekPVrRiqJoFxu/pYu878x0a8QryYDSXNwlhhy8A=; b=PiqNZhzsSJXPqL1o8hlD1MDaEf/m/CJ5OW5wF7QkdjFzCjoJDf/c3y975r9wDWJkyj 7hQGEcHRmOKt0ZFlBzmeUIKEmMwK9rVY5EC4l4/X8+VtOULiI2nnKmeNOoMSfO+OIEs1 Eh3xHWMICoAQ31uK4jBwsrll/SrZygI4RHYzRquS1iOrijpL7Ds1VZZU0rzVL8nPY4xQ XMy5xxm7+KuvjxOrCHS5fi8IvpKKJv5VxspoT6tV+DEqb9hriWEJRjaaHLZo6LN316GZ o5kmqqNLVPIey4fB/bZ1a4H9gHrSYRspBtIDDjpl62VgoKpvZ/wRuYx5tQ+4pk5bhbI8 E7lQ== X-Gm-Message-State: AIVw113ipRJiA0/9qXESDk5vrrslYIouPjwcm2QrLslEqdxPQf3NPwXB ZHUEdsFeWtxbzG0H X-Received: by 10.55.132.6 with SMTP id g6mr1756585qkd.300.1500955512516; Mon, 24 Jul 2017 21:05:12 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id m41sm9600924qtc.78.2017.07.24.21.05.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Jul 2017 21:05:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jul 2017 01:04:55 -0300 Message-Id: <20170725040455.428-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170720190131.6016-1-jamrial@gmail.com> References: <20170720190131.6016-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/atrac3: use float_dsp in reverse_matrixing() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/atrac3.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 6cdcdf1964..bb2f5ee828 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -467,8 +467,8 @@ static int add_tonal_components(float *spectrum, int num_components, #define INTERPOLATE(old, new, nsample) \ ((old) + (nsample) * 0.125 * ((new) - (old))) -static void reverse_matrixing(float *su1, float *su2, int *prev_code, - int *curr_code) +static void reverse_matrixing(ATRAC3Context *q, float *su1, float *su2, + int *prev_code, int *curr_code) { int i, nsample, band; float mc1_l, mc1_r, mc2_l, mc2_r; @@ -516,12 +516,7 @@ static void reverse_matrixing(float *su1, float *su2, int *prev_code, break; case 2: case 3: - for (; nsample < band + 256; nsample++) { - float c1 = su1[nsample]; - float c2 = su2[nsample]; - su1[nsample] = c1 + c2; - su2[nsample] = c1 - c2; - } + q->fdsp->butterflies_float(&su1[nsample], &su2[nsample], band + 256 - nsample); break; default: av_assert1(0); @@ -717,7 +712,7 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, return ret; /* Reconstruct the channel coefficients. */ - reverse_matrixing(out_samples[ch], out_samples[ch+1], + reverse_matrixing(q, out_samples[ch], out_samples[ch+1], q->matrix_coeff_index_prev[js_pair], q->matrix_coeff_index_now[js_pair]);