Bug 1407487 - P1: Remove --enable-cubeb-remoting. r=kinetik,rillian

Replace with conditional compilation enabled for Linux targets.

MozReview-Commit-ID: GjD0Ix8aeJW

--HG--
extra : rebase_source : 18dd93eda0a9ebc1846a876caa4f5d27d8b75909
This commit is contained in:
Dan Glastonbury 2017-10-12 10:32:29 +10:00
Родитель e6d91cf38e
Коммит 3490136c59
4 изменённых файлов: 8 добавлений и 17 удалений

Просмотреть файл

@ -48,6 +48,10 @@
#define MASK_3F3R_LFE (MASK_3F2_LFE | (1 << AudioConfig::CHANNEL_RCENTER))
#define MASK_3F4_LFE (MASK_3F2_LFE | (1 << AudioConfig::CHANNEL_RLS) | (1 << AudioConfig::CHANNEL_RRS))
#ifdef XP_LINUX
#define MOZ_CUBEB_REMOTING
#endif
extern "C" {
// These functions are provided by audioipc-server crate
extern void* audioipc_server_start();

Просмотреть файл

@ -206,9 +206,8 @@ private:
// resume background video decoding when the cursor is hovering over the tab.
DECL_MEDIA_PREF("media.resume-bkgnd-video-on-tabhover", ResumeVideoDecodingOnTabHover, bool, false);
#ifdef MOZ_CUBEB_REMOTING
// Enable sandboxing support for cubeb
DECL_MEDIA_PREF("media.cubeb.sandbox", CubebSandbox, bool, false);
#endif // MOZ_CUBEB_REMOTING
DECL_MEDIA_PREF("media.videocontrols.lock-video-orientation", VideoOrientationLockEnabled, bool, false);
public:

Просмотреть файл

@ -23,7 +23,9 @@ if CONFIG['MOZ_PULSEAUDIO']:
if CONFIG['MOZ_RUST_SIMD']:
gkrust_features += ['simd-accel']
if CONFIG['MOZ_CUBEB_REMOTING']:
# This feature is only supported on Linux and this check needs to
# match XP_LINUX.
if CONFIG['OS_ARCH'] == 'Linux':
gkrust_features += ['cubeb-remoting']
gkrust_features += ['no-static-ideograph-encoder-tables']

Просмотреть файл

@ -1144,20 +1144,6 @@ def geckodriver(enable, automation, compile_env, cross_compile, hazard, target):
set_config('ENABLE_GECKODRIVER', geckodriver)
# Cubeb Audio Remoting
# ==============================================================
option('--enable-cubeb-remoting', env='MOZ_CUBEB_REMOTING',
help='Enable cubeb audio remoting')
@depends('--enable-cubeb-remoting')
def cubeb_remoting(value):
if value:
return True
set_config('MOZ_CUBEB_REMOTING', cubeb_remoting)
set_define('MOZ_CUBEB_REMOTING', cubeb_remoting)
# WebRTC
# ========================================================
@depends(target)