diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 20:19:26 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 20:19:26 +0000 |
| commit | 03021baf066b0876832c5addd71738b3ef2592c0 (patch) | |
| tree | 5e7d67cc1bf7de57f288455cf7eaff1bc1280fba /third_party/opus | |
| parent | 0eaa20bc3aa87e10a12bef14a16345680b919011 (diff) | |
| download | chromium_src-03021baf066b0876832c5addd71738b3ef2592c0.zip chromium_src-03021baf066b0876832c5addd71738b3ef2592c0.tar.gz chromium_src-03021baf066b0876832c5addd71738b3ef2592c0.tar.bz2 | |
Revert 163650 - Add opus audio codec support in remoting
BUG=154714
Review URL: https://chromiumcodereview.appspot.com/11189047
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11252002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/opus')
| -rw-r--r-- | third_party/opus/opus.gyp | 42 | ||||
| -rw-r--r-- | third_party/opus/overrides/include/opus_defines.h | 19 |
2 files changed, 13 insertions, 48 deletions
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp index d1df5e2..c11c9e1 100644 --- a/third_party/opus/opus.gyp +++ b/third_party/opus/opus.gyp @@ -12,41 +12,17 @@ { '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', ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'overrides/include', - 'src/include', - ], - }, + 'defines': [ + 'OPUS_BUILD', + 'VAR_ARRAYS', + 'WORDS_BIGENDIAN', + ], 'sources': [ 'src/celt/_kiss_fft_guts.h', 'src/celt/arch.h', @@ -234,6 +210,14 @@ 'src/src/opus_multistream.c', 'src/src/repacketizer.c', ], + 'conditions': [ + ['os_posix == 1', { + 'defines': [ + 'HAVE_LRINT', + 'HAVE_LRINTF', + ], + }], + ], }, # target opus ] }, { # use_system_opus != 0 diff --git a/third_party/opus/overrides/include/opus_defines.h b/third_party/opus/overrides/include/opus_defines.h deleted file mode 100644 index 290bc91..0000000 --- a/third_party/opus/overrides/include/opus_defines.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/stringize_macros.h" - -// HACK: This is a hack to make sure that we don't export opus symbols. -// opus_defines.h sets OPUS_EXPORT only when OPUS_BUILD is defined. -#if defined(OPUS_BUILD) -#undef OPUS_BUILD -#define OPUS_BUILD_DEFINED -#endif // defined(OPUS_BUILD) - -#include "third_party/opus/src/include/opus_defines.h" - -#if defined(OPUS_BUILD_DEFINED) -#undef OPUS_BUILD_DEFINED -#define OPUS_BUILD -#endif // defined(OPUS_BUILD_DEFINED) |