generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Getting Opus from Chrome

Browse Source 
This CL replaces http://review.webrtc.org/921006/

BUG=issue982

TBR=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/933006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2993 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tina.legrand@webrtc.org 2012-10-25 12:37:08 +00:00
parent d6ec386ff5
commit 1f8c02a4de
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEPS
View File

@ -57,6 +57,12 @@ deps = {
"third_party/libyuv": "third_party/libyuv":
(Var("googlecode_url") % "libyuv") + "/trunk@426", (Var("googlecode_url") % "libyuv") + "/trunk@426",
"third_party/opus":
Var("chromium_trunk") + "/src/third_party/opus@163910",
"third_party/opus/src":
Var("chromium_trunk") + "/deps/third_party/opus@162558",
"third_party/protobuf": "third_party/protobuf":
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),

1
tools/create_supplement_gypi.py
View File

@ -15,7 +15,6 @@ supplement_gypi = """#!/usr/bin/env python
{ {
'variables': { 'variables': {
'build_with_chromium': 0, 'build_with_chromium': 0,
'build_with_mozilla': 0,
} }
} }
""" """

8
webrtc/build/common.gypi
View File

@ -72,7 +72,7 @@
'build_libyuv%': 1, 'build_libyuv%': 1,
'build_libvpx%': 1, 'build_libvpx%': 1,
# Enable to use the Mozilla internal Opus version. # Enable to use the Mozilla internal settings.
'build_with_mozilla%': 0, 'build_with_mozilla%': 0,
'libyuv_dir%': '<(DEPTH)/third_party/libyuv', 'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
@ -143,6 +143,12 @@
#'WEBRTC_SVNREVISION="<!(python <(webrtc_root)/build/version.py)"', #'WEBRTC_SVNREVISION="<!(python <(webrtc_root)/build/version.py)"',
], ],
'conditions': [ 'conditions': [
['build_with_mozilla==1', {
'defines': [
# Changes settings for Mozilla build.
'WEBRTC_MOZILLA_BUILD',
],
}],
['build_with_chromium==1', { ['build_with_chromium==1', {
'defines': [ 'defines': [
# Changes settings for Chromium build. # Changes settings for Chromium build.

11
webrtc/modules/audio_coding/codecs/opus/opus.gypi
View File

@ -22,19 +22,10 @@
'<(DEPTH)/third_party/opus/opus.gyp:opus' '<(DEPTH)/third_party/opus/opus.gyp:opus'
], ],
'include_dirs': [ 'include_dirs': [
'<(webrtc_root)/../third_party/opus/source/include', '<(DEPTH)/third_party/opus',
], ],
}], }],
], ],
'direct_dependent_settings': {
'conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DIST)/include/opus',
],
}],
],
},
'sources': [ 'sources': [
'interface/opus_interface.h', 'interface/opus_interface.h',
'opus_interface.c', 'opus_interface.c',