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

Unified Diff: remoting/remoting.gyp

Issue 10831246: Speex encoding/decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index c0924d4d8c9dfade9e6c703c7f2d730e7b8e627b..223b41f31ed7d697d93e6d6507cabe580af9aca2 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1128,6 +1128,7 @@
'../skia/skia.gyp:skia',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../third_party/speex/speex.gyp:libspeex',
'../third_party/zlib/zlib.gyp:zlib',
'../media/media.gyp:yuv_convert',
'remoting_jingle_glue',
@@ -1186,9 +1187,13 @@
# target.
'codec/audio_decoder.cc',
'codec/audio_decoder.h',
+ 'codec/audio_decoder_speex.cc',
+ 'codec/audio_decoder_speex.h',
'codec/audio_decoder_verbatim.cc',
'codec/audio_decoder_verbatim.h',
'codec/audio_encoder.h',
+ 'codec/audio_encoder_speex.cc',
+ 'codec/audio_encoder_speex.h',
'codec/audio_encoder_verbatim.cc',
'codec/audio_encoder_verbatim.h',
],
@@ -1205,6 +1210,13 @@
'differ_block',
'../crypto/crypto.gyp:crypto',
],
+ 'include_dirs': [
+ # chromoting_host.cc needs to call the AudioEncoderSpeex constructor,
+ # which needs this include.
+ # TODO(kxing): Refactor the code out of chromoting_host.cc and remove
+ # this include directory.
+ '../third_party/speex/include',
Sergey Ulanov 2012/08/10 20:41:37 You can avoid it - see my comments in audio_decode
kxing 2012/08/13 21:39:45 Done.
+ ],
'sources': [
'host/audio_capturer.cc',
'host/audio_capturer.h',
« remoting/protocol/content_description.cc ('K') | « remoting/protocol/session_config.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698