From 8d02bd8dc01d63d6a1eec105d6162f0b2aae2814 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 13 Feb 2016 22:12:38 -0500
Subject: [PATCH] Add Opus library for audio decoding

---
 .gitmodules |   3 ++
 Makefile    |   9 ++--
 common-c.mk |   4 +-
 opus        |   1 +
 opus.mk     | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 156 insertions(+), 4 deletions(-)
 create mode 160000 opus
 create mode 100644 opus.mk

diff --git a/.gitmodules b/.gitmodules
index f446d08..f325602 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "moonlight-common-c"]
 	path = moonlight-common-c
 	url = https://github.com/moonlight-stream/moonlight-common-c.git
+[submodule "opus"]
+	path = opus
+	url = https://github.com/xiph/opus.git
diff --git a/Makefile b/Makefile
index 202a0a0..de0bd95 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,11 @@ VALID_TOOLCHAINS := pnacl
 
 TARGET = moonlight-chrome
 
-# Include Moonlight-Common-C makefile
+# Include library makefiles
 include common-c.mk
+include opus.mk
 
-EXTRA_INC_PATHS := $(EXTRA_INC_PATHS) $(COMMON_C_INCLUDE)
+EXTRA_INC_PATHS := $(EXTRA_INC_PATHS) $(COMMON_C_INCLUDE) $(OPUS_INCLUDE)
 
 include $(NACL_SDK_ROOT)/tools/common.mk
 
@@ -16,8 +17,10 @@ CHROME_ARGS += --allow-nacl-socket-api=localhost
 
 LIBS = ppapi_gles2 ppapi ppapi_cpp pthread nacl_io
 
-CFLAGS = -Wall -Wno-missing-braces
+CFLAGS = -Wall $(COMMON_C_C_FLAGS) $(OPUS_C_FLAGS)
+
 SOURCES = \
+    $(OPUS_SOURCE)           \
     $(COMMON_C_SOURCE)       \
     libchelper.c             \
     main.cpp                 \
diff --git a/common-c.mk b/common-c.mk
index 38b0c54..e4bebd6 100644
--- a/common-c.mk
+++ b/common-c.mk
@@ -26,4 +26,6 @@ COMMON_C_SOURCE := \
 	$(COMMON_C_DIR)/VideoStream.c         \
 	$(OPENAES_SOURCE)                     \
 
-COMMON_C_INCLUDE := $(COMMON_C_DIR) $(OPENAES_INCLUDE)
\ No newline at end of file
+COMMON_C_INCLUDE := $(COMMON_C_DIR) $(OPENAES_INCLUDE)
+
+COMMON_C_C_FLAGS := -Wno-missing-braces
\ No newline at end of file
diff --git a/opus b/opus
new file mode 160000
index 0000000..81bb160
--- /dev/null
+++ b/opus
@@ -0,0 +1 @@
+Subproject commit 81bb160d17c9542ad9cfba05067371b618d1719f
diff --git a/opus.mk b/opus.mk
new file mode 100644
index 0000000..ca928ce
--- /dev/null
+++ b/opus.mk
@@ -0,0 +1,143 @@
+OPUS_DIR := opus
+
+OPUS_C_FLAGS := \
+    -DUSE_ALLOCA -DHAVE_LRINT -DHAVE_LRINTF \
+    -DFIXED_POINT -DOPUS_BUILD \
+
+OPUS_SOURCE := \
+	$(OPUS_DIR)/celt/bands.c \
+    $(OPUS_DIR)/celt/celt.c \
+    $(OPUS_DIR)/celt/celt_decoder.c \
+    $(OPUS_DIR)/celt/celt_encoder.c \
+    $(OPUS_DIR)/celt/celt_lpc.c \
+    $(OPUS_DIR)/celt/cwrs.c \
+    $(OPUS_DIR)/celt/entcode.c \
+    $(OPUS_DIR)/celt/entdec.c \
+    $(OPUS_DIR)/celt/entenc.c \
+    $(OPUS_DIR)/celt/kiss_fft.c \
+    $(OPUS_DIR)/celt/laplace.c \
+    $(OPUS_DIR)/celt/mathops.c \
+    $(OPUS_DIR)/celt/mdct.c \
+    $(OPUS_DIR)/celt/modes.c \
+    $(OPUS_DIR)/celt/pitch.c \
+    $(OPUS_DIR)/celt/quant_bands.c \
+    $(OPUS_DIR)/celt/rate.c \
+    $(OPUS_DIR)/celt/vq.c \
+    $(OPUS_DIR)/silk/A2NLSF.c \
+    $(OPUS_DIR)/silk/ana_filt_bank_1.c \
+    $(OPUS_DIR)/silk/biquad_alt.c \
+    $(OPUS_DIR)/silk/bwexpander_32.c \
+    $(OPUS_DIR)/silk/bwexpander.c \
+    $(OPUS_DIR)/silk/check_control_input.c \
+    $(OPUS_DIR)/silk/CNG.c \
+    $(OPUS_DIR)/silk/code_signs.c \
+    $(OPUS_DIR)/silk/control_audio_bandwidth.c \
+    $(OPUS_DIR)/silk/control_codec.c \
+    $(OPUS_DIR)/silk/control_SNR.c \
+    $(OPUS_DIR)/silk/debug.c \
+    $(OPUS_DIR)/silk/dec_API.c \
+    $(OPUS_DIR)/silk/decode_core.c \
+    $(OPUS_DIR)/silk/decode_frame.c \
+    $(OPUS_DIR)/silk/decode_indices.c \
+    $(OPUS_DIR)/silk/decode_parameters.c \
+    $(OPUS_DIR)/silk/decode_pitch.c \
+    $(OPUS_DIR)/silk/decode_pulses.c \
+    $(OPUS_DIR)/silk/decoder_set_fs.c \
+    $(OPUS_DIR)/silk/enc_API.c \
+    $(OPUS_DIR)/silk/encode_indices.c \
+    $(OPUS_DIR)/silk/encode_pulses.c \
+    $(OPUS_DIR)/silk/gain_quant.c \
+    $(OPUS_DIR)/silk/HP_variable_cutoff.c \
+    $(OPUS_DIR)/silk/init_decoder.c \
+    $(OPUS_DIR)/silk/init_encoder.c \
+    $(OPUS_DIR)/silk/inner_prod_aligned.c \
+    $(OPUS_DIR)/silk/interpolate.c \
+    $(OPUS_DIR)/silk/lin2log.c \
+    $(OPUS_DIR)/silk/log2lin.c \
+    $(OPUS_DIR)/silk/LPC_analysis_filter.c \
+    $(OPUS_DIR)/silk/LPC_inv_pred_gain.c \
+    $(OPUS_DIR)/silk/LP_variable_cutoff.c \
+    $(OPUS_DIR)/silk/NLSF2A.c \
+    $(OPUS_DIR)/silk/NLSF_decode.c \
+    $(OPUS_DIR)/silk/NLSF_del_dec_quant.c \
+    $(OPUS_DIR)/silk/NLSF_encode.c \
+    $(OPUS_DIR)/silk/NLSF_stabilize.c \
+    $(OPUS_DIR)/silk/NLSF_unpack.c \
+    $(OPUS_DIR)/silk/NLSF_VQ.c \
+    $(OPUS_DIR)/silk/NLSF_VQ_weights_laroia.c \
+    $(OPUS_DIR)/silk/NSQ.c \
+    $(OPUS_DIR)/silk/NSQ_del_dec.c \
+    $(OPUS_DIR)/silk/pitch_est_tables.c \
+    $(OPUS_DIR)/silk/PLC.c \
+    $(OPUS_DIR)/silk/process_NLSFs.c \
+    $(OPUS_DIR)/silk/quant_LTP_gains.c \
+    $(OPUS_DIR)/silk/resampler.c \
+    $(OPUS_DIR)/silk/resampler_down2_3.c \
+    $(OPUS_DIR)/silk/resampler_down2.c \
+    $(OPUS_DIR)/silk/resampler_private_AR2.c \
+    $(OPUS_DIR)/silk/resampler_private_down_FIR.c \
+    $(OPUS_DIR)/silk/resampler_private_IIR_FIR.c \
+    $(OPUS_DIR)/silk/resampler_private_up2_HQ.c \
+    $(OPUS_DIR)/silk/resampler_rom.c \
+    $(OPUS_DIR)/silk/shell_coder.c \
+    $(OPUS_DIR)/silk/sigm_Q15.c \
+    $(OPUS_DIR)/silk/sort.c \
+    $(OPUS_DIR)/silk/stereo_decode_pred.c \
+    $(OPUS_DIR)/silk/stereo_encode_pred.c \
+    $(OPUS_DIR)/silk/stereo_find_predictor.c \
+    $(OPUS_DIR)/silk/stereo_LR_to_MS.c \
+    $(OPUS_DIR)/silk/stereo_MS_to_LR.c \
+    $(OPUS_DIR)/silk/stereo_quant_pred.c \
+    $(OPUS_DIR)/silk/sum_sqr_shift.c \
+    $(OPUS_DIR)/silk/table_LSF_cos.c \
+    $(OPUS_DIR)/silk/tables_gain.c \
+    $(OPUS_DIR)/silk/tables_LTP.c \
+    $(OPUS_DIR)/silk/tables_NLSF_CB_NB_MB.c \
+    $(OPUS_DIR)/silk/tables_NLSF_CB_WB.c \
+    $(OPUS_DIR)/silk/tables_other.c \
+    $(OPUS_DIR)/silk/tables_pitch_lag.c \
+    $(OPUS_DIR)/silk/tables_pulses_per_block.c \
+    $(OPUS_DIR)/silk/VAD.c \
+    $(OPUS_DIR)/silk/VQ_WMat_EC.c \
+    $(OPUS_DIR)/silk/fixed/apply_sine_window_FIX.c \
+    $(OPUS_DIR)/silk/fixed/autocorr_FIX.c \
+    $(OPUS_DIR)/silk/fixed/burg_modified_FIX.c \
+    $(OPUS_DIR)/silk/fixed/corrMatrix_FIX.c \
+    $(OPUS_DIR)/silk/fixed/encode_frame_FIX.c \
+    $(OPUS_DIR)/silk/fixed/find_LPC_FIX.c \
+    $(OPUS_DIR)/silk/fixed/find_LTP_FIX.c \
+    $(OPUS_DIR)/silk/fixed/find_pitch_lags_FIX.c \
+    $(OPUS_DIR)/silk/fixed/find_pred_coefs_FIX.c \
+    $(OPUS_DIR)/silk/fixed/k2a_FIX.c \
+    $(OPUS_DIR)/silk/fixed/k2a_Q16_FIX.c \
+    $(OPUS_DIR)/silk/fixed/LTP_analysis_filter_FIX.c \
+    $(OPUS_DIR)/silk/fixed/LTP_scale_ctrl_FIX.c \
+    $(OPUS_DIR)/silk/fixed/noise_shape_analysis_FIX.c \
+    $(OPUS_DIR)/silk/fixed/pitch_analysis_core_FIX.c \
+    $(OPUS_DIR)/silk/fixed/prefilter_FIX.c \
+    $(OPUS_DIR)/silk/fixed/process_gains_FIX.c \
+    $(OPUS_DIR)/silk/fixed/regularize_correlations_FIX.c \
+    $(OPUS_DIR)/silk/fixed/residual_energy16_FIX.c \
+    $(OPUS_DIR)/silk/fixed/residual_energy_FIX.c \
+    $(OPUS_DIR)/silk/fixed/schur64_FIX.c \
+    $(OPUS_DIR)/silk/fixed/schur_FIX.c \
+    $(OPUS_DIR)/silk/fixed/solve_LS_FIX.c \
+    $(OPUS_DIR)/silk/fixed/vector_ops_FIX.c \
+    $(OPUS_DIR)/silk/fixed/warped_autocorrelation_FIX.c \
+    $(OPUS_DIR)/src/analysis.c \
+    $(OPUS_DIR)/src/mlp.c \
+    $(OPUS_DIR)/src/mlp_data.c \
+    $(OPUS_DIR)/src/opus.c \
+    $(OPUS_DIR)/src/opus_decoder.c \
+    $(OPUS_DIR)/src/opus_encoder.c \
+    $(OPUS_DIR)/src/opus_multistream.c \
+    $(OPUS_DIR)/src/opus_multistream_decoder.c \
+    $(OPUS_DIR)/src/opus_multistream_encoder.c \
+    $(OPUS_DIR)/src/repacketizer.c \
+
+OPUS_INCLUDE := \
+    $(OPUS_DIR)/include    \
+    $(OPUS_DIR)/src        \
+    $(OPUS_DIR)/silk       \
+    $(OPUS_DIR)/celt       \
+    $(OPUS_DIR)/silk/fixed \