mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
7095f1cc1d
New upstream release. This fixes a unified build issue with MAX_PULSES and incorporates our TonalityAnalysisState initializer patch. Issues remain in the unified build with QA and opus_custom_*coder_get_size declarations, so we still need to build those separately.
39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
diff --git a/media/libopus/sources.mozbuild b/media/libopus/sources.mozbuild
|
|
index 8a39b9f..dfc2c62 100644
|
|
--- a/media/libopus/sources.mozbuild
|
|
+++ b/media/libopus/sources.mozbuild
|
|
@@ -2,8 +2,6 @@
|
|
celt_sources = [
|
|
'celt/bands.c',
|
|
'celt/celt.c',
|
|
- 'celt/celt_decoder.c',
|
|
- 'celt/celt_encoder.c',
|
|
'celt/celt_lpc.c',
|
|
'celt/cwrs.c',
|
|
'celt/entcode.c',
|
|
@@ -20,6 +18,15 @@ celt_sources = [
|
|
'celt/vq.c',
|
|
]
|
|
|
|
+opus_nonunified_sources = [
|
|
+ # Disabled because of name clash of opus_custom_encoder_get_size.
|
|
+ 'celt/celt_decoder.c',
|
|
+ 'celt/celt_encoder.c',
|
|
+ # Disabled for (safe) warning about QA redefinition.
|
|
+ 'silk/LPC_inv_pred_gain.c',
|
|
+ 'silk/NLSF2A.c',
|
|
+]
|
|
+
|
|
celt_sources_sse = [
|
|
'celt/x86/pitch_sse.c',
|
|
'celt/x86/x86_celt_map.c',
|
|
@@ -105,8 +112,6 @@ silk_sources = [
|
|
'silk/log2lin.c',
|
|
'silk/LP_variable_cutoff.c',
|
|
'silk/LPC_analysis_filter.c',
|
|
- 'silk/LPC_inv_pred_gain.c',
|
|
- 'silk/NLSF2A.c',
|
|
'silk/NLSF_decode.c',
|
|
'silk/NLSF_del_dec_quant.c',
|
|
'silk/NLSF_encode.c',
|