From 202355538cd6c7015d1e33907c14de9a4ac57d08 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Mon, 2 Dec 2013 15:00:00 -0800 Subject: [PATCH] Bug 945419 - Fix fixed-point opus stereo encode regression. r=jmspeex. --- media/libopus/README_MOZILLA | 2 +- media/libopus/celt/celt_encoder.c | 2 +- media/libopus/moz.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media/libopus/README_MOZILLA b/media/libopus/README_MOZILLA index c998a62a5007..ea2930a0fa00 100644 --- a/media/libopus/README_MOZILLA +++ b/media/libopus/README_MOZILLA @@ -8,4 +8,4 @@ files after the copy step. The upstream repository is https://git.xiph.org/opus.git -The git tag/revision used was v1.1-rc2-1-g35a44c6. +The git tag/revision used was v1.1-rc2-2-g086ea7c. diff --git a/media/libopus/celt/celt_encoder.c b/media/libopus/celt/celt_encoder.c index 91c121232213..1ceb75e250c6 100644 --- a/media/libopus/celt/celt_encoder.c +++ b/media/libopus/celt/celt_encoder.c @@ -1816,7 +1816,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, if (LM!=0) dual_stereo = stereo_analysis(mode, X, LM, N); - st->intensity = hysteresis_decision((opus_val16)equiv_rate/1000, + st->intensity = hysteresis_decision((opus_val16)(equiv_rate/1000), intensity_thresholds, intensity_histeresis, 21, st->intensity); st->intensity = IMIN(st->end,IMAX(st->start, st->intensity)); } diff --git a/media/libopus/moz.build b/media/libopus/moz.build index 935f7ffe24b2..53b5befaae10 100644 --- a/media/libopus/moz.build +++ b/media/libopus/moz.build @@ -16,7 +16,7 @@ MSVC_ENABLE_PGO = True FINAL_LIBRARY = 'gkmedias' DEFINES['OPUS_BUILD'] = True -DEFINES['OPUS_VERSION'] = '"v1.1-rc2-1-g35a44c6-mozilla"' +DEFINES['OPUS_VERSION'] = '"v1.1-rc2-2-g086ea7c-mozilla"' DEFINES['USE_ALLOCA'] = True if CONFIG['OS_ARCH'] in ('Linux', 'Darwin', 'DragonFly', 'FreeBSD',