author | Ralph Giles <giles@mozilla.com> |
Mon, 02 Dec 2013 15:00:00 -0800 | |
changeset 158935 | 82969423bfb6ca8a02c4223bc9f4563a76427107 |
parent 158934 | f3161ee517132587ec6889500e1df46c09a58749 |
child 158936 | bd4960d0fddb4b57b0e0075b534b179330b99044 |
push id | 25767 |
push user | ryanvm@gmail.com |
push date | Thu, 05 Dec 2013 22:29:08 +0000 |
treeherder | mozilla-central@ee425b3ccc29 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jmspeex |
bugs | 945419 |
milestone | 28.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/media/libopus/README_MOZILLA +++ b/media/libopus/README_MOZILLA @@ -3,9 +3,9 @@ IETF Opus audio codec reference implemen The source in this directory was copied from an opus repository checkout by running the ./update.sh script. Any changes made to this version of the source should be reflected in that script, e.g. by applying patch 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.
--- a/media/libopus/celt/celt_encoder.c +++ b/media/libopus/celt/celt_encoder.c @@ -1811,17 +1811,17 @@ int celt_encode_with_ec(CELTEncoder * OP { 1, 2, 3, 4, 5, 6, 7, 8,16,24,36,44,50,56,62,67,72,79,88,106,134}; static const opus_val16 intensity_histeresis[21]= { 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 5, 6, 8, 8}; /* Always use MS for 2.5 ms frames until we can do a better analysis */ 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)); } alloc_trim = 5; if (tell+(6<<BITRES) <= total_bits - total_boost) { if (st->lfe)
--- a/media/libopus/moz.build +++ b/media/libopus/moz.build @@ -11,17 +11,17 @@ EXPORTS.opus += [ 'include/opus_types.h', ] 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', 'NetBSD', 'OpenBSD'): DEFINES['HAVE_LRINTF'] = True if CONFIG['OS_ARCH'] == 'WINNT': DEFINES['inline'] = '__inline'