Bug 1374870 - opus: Update import script. r?kinetik draft
authorRalph Giles <giles@mozilla.com>
Tue, 20 Jun 2017 17:11:41 -0700
changeset 597809 28542dbddde64996e65a398d5c941e5a51e9e5b0
parent 597455 464b2a3c25aa1065760d9ecbb0870bca4a66c62e
child 597810 cd294f3c3e7b89bfd9641cdbc71ec933d0337b97
push id65032
push userbmo:giles@thaumas.net
push dateWed, 21 Jun 2017 00:23:07 +0000
reviewerskinetik
bugs1374870
milestone56.0a1
Bug 1374870 - opus: Update import script. r?kinetik The rename patch was merged upstream. MozReview-Commit-ID: 42gAnSL2tER
media/libopus/rename.patch
media/libopus/update.sh
deleted file mode 100644
--- a/media/libopus/rename.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/silk/tables_NLSF_CB_WB.c b/silk/tables_NLSF_CB_WB.c
-index a15f7eb..5cc9f57 100644
---- a/silk/tables_NLSF_CB_WB.c
-+++ b/silk/tables_NLSF_CB_WB.c
-@@ -98,7 +98,7 @@ static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = {
-        110,    119,    129,    141,    175,    198,    218,    237
- };
- 
--static const opus_int16 silk_NLSF_CB1_Wght_Q9[ 512 ] = {
-+static const opus_int16 silk_NLSF_CB1_WB_Wght_Q9[ 512 ] = {
-      3657, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2963, 2963, 2925, 2846,
-      3216, 3085, 2972, 3056, 3056, 3010, 3010, 3010, 2963, 2963, 3010, 2972, 2888, 2846, 2846, 2726,
-      3920, 4014, 2981, 3207, 3207, 2934, 3056, 2846, 3122, 3244, 2925, 2846, 2620, 2553, 2780, 2925,
-@@ -223,7 +223,7 @@ const silk_NLSF_CB_struct silk_NLSF_CB_WB =
-     SILK_FIX_CONST( 0.15, 16 ),
-     SILK_FIX_CONST( 1.0 / 0.15, 6 ),
-     silk_NLSF_CB1_WB_Q8,
--    silk_NLSF_CB1_Wght_Q9,
-+    silk_NLSF_CB1_WB_Wght_Q9,
-     silk_NLSF_CB1_iCDF_WB,
-     silk_NLSF_PRED_WB_Q8,
-     silk_NLSF_CB2_SELECT_WB,
--- a/media/libopus/update.sh
+++ b/media/libopus/update.sh
@@ -70,9 +70,8 @@ sed -e "s/^The git tag\/revision used wa
 sed -e "s/DEFINES\['OPUS_VERSION'\][ \t]*=[ \t]*'\".*\"'/DEFINES['OPUS_VERSION'] = '\"${version}-mozilla\"'/" \
     ${TARGET}/moz.build > ${TARGET}/moz.build+ && \
     mv ${TARGET}/moz.build+ ${TARGET}/moz.build
 
 python gen-sources.py $1
 
 # apply outstanding local patches
 patch -p3 < nonunified.patch
-patch -p1 < rename.patch