nonunified.patch 1.0 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. diff --git a/media/libopus/sources.mozbuild b/media/libopus/sources.mozbuild
  2. index 8a39b9f..dfc2c62 100644
  3. --- a/media/libopus/sources.mozbuild
  4. +++ b/media/libopus/sources.mozbuild
  5. @@ -2,8 +2,6 @@
  6. celt_sources = [
  7. 'celt/bands.c',
  8. 'celt/celt.c',
  9. - 'celt/celt_decoder.c',
  10. - 'celt/celt_encoder.c',
  11. 'celt/celt_lpc.c',
  12. 'celt/cwrs.c',
  13. 'celt/entcode.c',
  14. @@ -20,6 +18,15 @@ celt_sources = [
  15. 'celt/vq.c',
  16. ]
  17. +opus_nonunified_sources = [
  18. + # Disabled because of name clash of opus_custom_encoder_get_size.
  19. + 'celt/celt_decoder.c',
  20. + 'celt/celt_encoder.c',
  21. + # Disabled for (safe) warning about QA redefinition.
  22. + 'silk/LPC_inv_pred_gain.c',
  23. + 'silk/NLSF2A.c',
  24. +]
  25. +
  26. celt_sources_sse = [
  27. 'celt/x86/pitch_sse.c',
  28. 'celt/x86/x86_celt_map.c',
  29. @@ -105,8 +112,6 @@ silk_sources = [
  30. 'silk/log2lin.c',
  31. 'silk/LP_variable_cutoff.c',
  32. 'silk/LPC_analysis_filter.c',
  33. - 'silk/LPC_inv_pred_gain.c',
  34. - 'silk/NLSF2A.c',
  35. 'silk/NLSF_decode.c',
  36. 'silk/NLSF_del_dec_quant.c',
  37. 'silk/NLSF_encode.c',