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

Enable Opus

Browse Source 
BUG=webrtc issue 992
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/942004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3012 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-10-27 17:46:55 +00:00
parent 8186534111
commit 6f19b1b651
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/build/common.gypi
View File

@ -32,15 +32,7 @@
'webrtc_root%': '<(webrtc_root)',
'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
# Enable opus for Chrome only right now.
'conditions': [
['build_with_chromium==1', {
'include_opus%': 1,
}, {
'include_opus%': 0,
}],
],
'include_opus%': 1,
},
'build_with_chromium%': '<(build_with_chromium)',
'webrtc_root%': '<(webrtc_root)',

14
webrtc/video_engine/test/android/jni/Android.mk
View File

@ -120,6 +120,18 @@ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/webrtc/modules/libisac_neon.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libopus
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/third_party/opus/libopus.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libwebrtc_opus
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/webrtc/modules/libwebrtc_opus.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libvad
LOCAL_SRC_FILES := \
@ -292,6 +304,8 @@ LOCAL_STATIC_LIBRARIES := \
libiLBC \
libiSACFix \
libisac_neon \
libwebrtc_opus \
libopus \
libvad \
libbitrate_controller \
libresampler \