Hello community, here is the log from the commit of package opus for openSUSE:Factory checked in at 2020-04-25 20:12:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opus (Old) and /work/SRC/openSUSE:Factory/.opus.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opus" Sat Apr 25 20:12:18 2020 rev:22 rq:795967 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/opus/opus.changes 2019-08-19 20:47:00.277103408 +0200 +++ /work/SRC/openSUSE:Factory/.opus.new.2738/opus.changes 2020-04-25 20:12:32.240068933 +0200 @@ -1,0 +2,8 @@ +Wed Apr 15 17:38:39 UTC 2020 - Gustavo Pichorim Boiko <[email protected]> + +- Backport of an upstream fix for celt decoder: + * opus-Fix-celt-decoder-assertion-when-using-OPUS_CUSTOM.patch: When + using OPUS_CUSTOM, `CELTDecoder->end` can be larger than 21. + Assert against 25 instead in OPUS_CUSTOM builds. + +------------------------------------------------------------------- New: ---- opus-Fix-celt-decoder-assertion-when-using-OPUS_CUSTOM.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opus.spec ++++++ --- /var/tmp/diff_new_pack.pBGZio/_old 2020-04-25 20:12:35.588075836 +0200 +++ /var/tmp/diff_new_pack.pBGZio/_new 2020-04-25 20:12:35.588075836 +0200 @@ -1,7 +1,7 @@ # # spec file for package opus # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2012 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -31,6 +31,8 @@ Patch0: opus-Silk-CNG-adapts-faster.patch # PATCH-FIX-UPSTREAM opus-Silk-fix-arm-optimization.patch -- Avoid processing LPC coeffs beyond the given order in NEON optimizations Patch1: opus-Silk-fix-arm-optimization.patch +# PATCH-FIX-UPSTREAM opus-Fix-celt-decoder-assertion-when-using-OPUS_CUSTOM.patch -- Fix celt decoder assertion when using OPUS_CUSTOM +Patch2: opus-Fix-celt-decoder-assertion-when-using-OPUS_CUSTOM.patch BuildRequires: pkgconfig %description @@ -61,6 +63,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \ ++++++ opus-Fix-celt-decoder-assertion-when-using-OPUS_CUSTOM.patch ++++++ >From 06a651547f4a197c29b6abc23b530833855ee358 Mon Sep 17 00:00:00 2001 From: Niclas Olmenius <[email protected]> Date: Wed, 19 Feb 2020 13:58:35 +0100 Subject: [PATCH] Fix celt decoder assertion when using OPUS_CUSTOM When using OPUS_CUSTOM, `CELTDecoder->end` can be larger than 21. Assert against 25 instead in OPUS_CUSTOM builds. Signed-off-by: Jean-Marc Valin <[email protected]> --- celt/celt_decoder.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c index e6efce93..74ca3b74 100644 --- a/celt/celt_decoder.c +++ b/celt/celt_decoder.c @@ -117,13 +117,19 @@ void validate_celt_decoder(CELTDecoder *st) #ifndef CUSTOM_MODES celt_assert(st->mode == opus_custom_mode_create(48000, 960, NULL)); celt_assert(st->overlap == 120); + celt_assert(st->end <= 21); +#else +/* From Section 4.3 in the spec: "The normal CELT layer uses 21 of those bands, + though Opus Custom (see Section 6.2) may use a different number of bands" + + Check if it's within the maximum number of Bark frequency bands instead */ + celt_assert(st->end <= 25); #endif celt_assert(st->channels == 1 || st->channels == 2); celt_assert(st->stream_channels == 1 || st->stream_channels == 2); celt_assert(st->downsample > 0); celt_assert(st->start == 0 || st->start == 17); celt_assert(st->start < st->end); - celt_assert(st->end <= 21); #ifdef OPUS_ARCHMASK celt_assert(st->arch >= 0); celt_assert(st->arch <= OPUS_ARCHMASK); -- 2.26.0
