Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Unified Diff: third_party/opus/opus.gyp

Issue 11189047: Add opus audio codec support in remoting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/remoting.gyp ('k') | third_party/opus/overrides/include/opus_defines.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/opus/opus.gyp
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp
index c11c9e13a81ee329048a06c508a7a5990e88e050..ffd84c713c3e703041a16425459562b184ff8739 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -12,17 +12,41 @@
{
'target_name': 'opus',
'type': 'static_library',
+ 'defines': [
+ 'OPUS_BUILD',
+ 'WORDS_BIGENDIAN',
+ ],
+ 'conditions': [
+ ['OS!="win"', {
+ 'defines': [
+ 'HAVE_LRINT',
+ 'HAVE_LRINTF',
+ 'VAR_ARRAYS',
+ ],
+ }, {
+ 'defines': [
+ 'USE_ALLOCA',
+ 'inline=__inline',
+ ],
+ 'msvs_disabled_warnings': [
+ 4305, # Disable truncation warning in celt/pitch.c .
+ ],
+ }],
+ ],
'include_dirs': [
+ '../..',
+ 'overrides/include',
'src/celt',
'src/include',
'src/silk',
'src/silk/float',
],
- 'defines': [
- 'OPUS_BUILD',
- 'VAR_ARRAYS',
- 'WORDS_BIGENDIAN',
- ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ 'overrides/include',
+ 'src/include',
+ ],
+ },
'sources': [
'src/celt/_kiss_fft_guts.h',
'src/celt/arch.h',
@@ -129,8 +153,6 @@
'src/silk/float/scale_vector_FLP.c',
'src/silk/float/schur_FLP.c',
'src/silk/float/SigProc_FLP.h',
- 'src/silk/float/silk_float.vcxproj',
- 'src/silk/float/silk_float.vcxproj.filters',
'src/silk/float/solve_LS_FLP.c',
'src/silk/float/sort_FLP.c',
'src/silk/float/structs_FLP.h',
@@ -210,14 +232,6 @@
'src/src/opus_multistream.c',
'src/src/repacketizer.c',
],
- 'conditions': [
- ['os_posix == 1', {
- 'defines': [
- 'HAVE_LRINT',
- 'HAVE_LRINTF',
- ],
- }],
- ],
}, # target opus
]
}, { # use_system_opus != 0
« no previous file with comments | « remoting/remoting.gyp ('k') | third_party/opus/overrides/include/opus_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698