From patchwork Sat Oct 8 15:20:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 911 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1845655vsd; Sat, 8 Oct 2016 08:35:43 -0700 (PDT) X-Received: by 10.194.90.206 with SMTP id by14mr20509643wjb.37.1475940943034; Sat, 08 Oct 2016 08:35:43 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ll4si27329037wjb.39.2016.10.08.08.35.40; Sat, 08 Oct 2016 08:35:43 -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; 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 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 06170689B91; Sat, 8 Oct 2016 18:35:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38858689891 for ; Sat, 8 Oct 2016 18:35:16 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id f193so7315837wmg.2 for ; Sat, 08 Oct 2016 08:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZHUVI+RvwslCLT2fDOixr8lQ1oFtEce4WMG0G+m1Law=; b=ya6YV+MdqLOH6L+JbC0Y7JtixZPIjz+lLRXU6fGRAe6EtFuM19ApEiETWC5ZEemfuc WiU0zhHef7+OXxxLKdyTAGDuhqIeZsj3h0rtfK6K0TtwE094QG6j7WM/ZQWZWSe7Thse IP0kGCCTCcK2CKnQ6igrkHwVnwSaRJOXhqWmtRAqPS61IY0bN2y7CBXlL5RaDkTol04V ZnzXwZ6DZp2C70cehoHhq0Olau6DdhXjyWjqP3eA5yPIcGu4ZKqmEPqbzQFoe/5t784e 17cexZl4pXLMnZyFHRGz0Hj/VqZRY1ylvTMuk3vLv08b7uDqOWmvjfu/+NMPvsJA4YHQ mLNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZHUVI+RvwslCLT2fDOixr8lQ1oFtEce4WMG0G+m1Law=; b=Dy+vN9zFJ7vKxaRLUfrvJ76UVQrx8m5I5tKSnrl3GeedHz0IC49Jsr1M6X9hV2Tds1 4M/uh3OxsjpyBoMESOanaHpq0AyI2sBXXFq2zdm8nPVcrTjoNinnY3seuRzNNoLDZb4r t0NG7yH/FOZweK1o1uC7ZNaf/AQR15eeL/GxssnDtiEhwUnmwu/F8qL/nl4oddXmj3+Z azni4pAzyJAWmFSsyb+1WyZLSNh2yjTPzpekUUTI7uzCgK/73ElcxCvvCMCBBTWZuwe6 /NMaDqCk25kjto8u8/NKxqPMs9x18NBJyGzAlmfBg79sV4z0mgFbSqd0RE+ViHDedGFB 9F4A== X-Gm-Message-State: AA6/9RnzqalZ9+vOFdjgRlgorekibq1gjSuDvHaisTxyrppGQ4REDu1RnitFN5tSA9sazA== X-Received: by 10.28.69.91 with SMTP id s88mr3106000wma.75.1475940036762; Sat, 08 Oct 2016 08:20:36 -0700 (PDT) Received: from moonbase.lan (host86-136-238-100.range86-136.btcentralplus.com. [86.136.238.100]) by smtp.gmail.com with ESMTPSA id w71sm8790208wmw.17.2016.10.08.08.20.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Oct 2016 08:20:35 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Oct 2016 16:20:30 +0100 Message-Id: <20161008152031.27351-2-atomnuker@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161008152031.27351-1-atomnuker@gmail.com> References: <20161008152031.27351-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/2] aacenc: use the decoder's lcg PRNG 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Using lfg was an overkill in this case where the random numbers were only used for encoder descisions. Should increase result uniformity between different FPUs and gives a slight speedup. Signed-off-by: Rostislav Pehlivanov --- libavcodec/aaccoder.c | 8 +++----- libavcodec/aacenc.c | 2 +- libavcodec/aacenc.h | 2 -- libavcodec/aacenc_utils.h | 13 +++++++++++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index 284b401..35787e8 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -643,11 +643,9 @@ static void search_for_pns(AACEncContext *s, AVCodecContext *avctx, SingleChanne float band_energy, scale, pns_senergy; const int start_c = (w+w2)*128+sce->ics.swb_offset[g]; band = &s->psy.ch[s->cur_channel].psy_bands[(w+w2)*16+g]; - for (i = 0; i < sce->ics.swb_sizes[g]; i+=2) { - double rnd[2]; - av_bmg_get(&s->lfg, rnd); - PNS[i+0] = (float)rnd[0]; - PNS[i+1] = (float)rnd[1]; + for (i = 0; i < sce->ics.swb_sizes[g]; i++) { + s->random_state = lcg_random(s->random_state); + PNS[i] = s->random_state; } band_energy = s->fdsp->scalarproduct_float(PNS, PNS, sce->ics.swb_sizes[g]); scale = noise_amp/sqrtf(band_energy); diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 9e421a9..ee3cbf8 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1031,7 +1031,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) goto fail; s->psypp = ff_psy_preprocess_init(avctx); ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON); - av_lfg_init(&s->lfg, 0x72adca55); + s->random_state = 0x1f2e3d4c; if (HAVE_MIPSDSP) ff_aac_coder_init_mips(s); diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 63e7893..1ace00d 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -23,7 +23,6 @@ #define AVCODEC_AACENC_H #include "libavutil/float_dsp.h" -#include "libavutil/lfg.h" #include "avcodec.h" #include "put_bits.h" @@ -100,7 +99,6 @@ typedef struct AACEncContext { FFTContext mdct1024; ///< long (1024 samples) frame transform context FFTContext mdct128; ///< short (128 samples) frame transform context AVFloatDSPContext *fdsp; - AVLFG lfg; ///< PRNG needed for PNS float *planar_samples[8]; ///< saved preprocessed input int profile; ///< copied from avctx diff --git a/libavcodec/aacenc_utils.h b/libavcodec/aacenc_utils.h index bb1dcb4..ff9188a 100644 --- a/libavcodec/aacenc_utils.h +++ b/libavcodec/aacenc_utils.h @@ -252,6 +252,19 @@ static inline int ff_sfdelta_can_replace(const SingleChannelElement *sce, && sce->sf_idx[nextband[band]] <= (new_sf + SCALE_MAX_DIFF); } +/** + * linear congruential pseudorandom number generator + * + * @param previous_val pointer to the current state of the generator + * + * @return Returns a 32-bit pseudorandom integer + */ +static av_always_inline int lcg_random(unsigned previous_val) +{ + union { unsigned u; int s; } v = { previous_val * 1664525u + 1013904223 }; + return v.s; +} + #define ERROR_IF(cond, ...) \ if (cond) { \ av_log(avctx, AV_LOG_ERROR, __VA_ARGS__); \