From 50513900c7fb491581fd37ea953b26ce1d35077f Mon Sep 17 00:00:00 2001 From: Eric Rahm Date: Fri, 11 Aug 2017 17:46:15 -0700 Subject: [PATCH] Bug 1389598 - Part 2: Remove gonk references from media/ r=jesup --HG-- extra : rebase_source : d1af2d0987038e1c0b0b0c971d0d2e4e9f08364a --- build/gyp.mozbuild | 1 - media/mtransport/common.build | 5 - media/mtransport/gonk_addrs.cpp | 170 ------------------ media/mtransport/third_party/nICEr/nicer.gyp | 13 -- media/webrtc/signaling/signaling.gyp | 12 +- .../signaling/src/jsep/JsepSessionImpl.cpp | 4 - .../src/mediapipeline/MediaPipeline.cpp | 4 - media/webrtc/trunk/build/common.gypi | 2 +- .../common_audio/resampler/resampler.cc | 2 +- .../audio_device/gonk/audio_manager.cc | 1 - .../modules/audio_device/gonk/audio_manager.h | 6 - .../linux/pulseaudiosymboltable_linux.cc | 2 +- .../modules/video_capture/video_capture.h | 2 +- .../system_wrappers/include/static_instance.h | 2 +- .../system_wrappers/source/cpu_features.cc | 4 +- .../voice_engine/voice_engine_defines.h | 4 +- 16 files changed, 10 insertions(+), 224 deletions(-) delete mode 100644 media/mtransport/gonk_addrs.cpp delete mode 100644 media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.cc delete mode 100644 media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.h diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild index 5b4eaa1b80fc..ed7043d2f958 100644 --- a/build/gyp.mozbuild +++ b/build/gyp.mozbuild @@ -60,7 +60,6 @@ gyp_vars.update({ 'arm_neon': 0, 'arm_neon_optional': 1, - 'moz_widget_toolkit_gonk': 0, 'moz_webrtc_omx': 0, 'moz_webrtc_mediacodec': 0, diff --git a/media/mtransport/common.build b/media/mtransport/common.build index e79979b95e49..ca914f42e821 100644 --- a/media/mtransport/common.build +++ b/media/mtransport/common.build @@ -28,11 +28,6 @@ mtransport_lcppsrcs = [ 'transportlayerprsock.cpp', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - mtransport_lcppsrcs += [ - 'gonk_addrs.cpp', - ] - mtransport_cppsrcs = [ '/media/mtransport/%s' % s for s in sorted(mtransport_lcppsrcs) ] diff --git a/media/mtransport/gonk_addrs.cpp b/media/mtransport/gonk_addrs.cpp deleted file mode 100644 index 1c69b711ec0c..000000000000 --- a/media/mtransport/gonk_addrs.cpp +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ -extern "C" { -#include -#include "r_types.h" -#include "stun.h" -#include "addrs.h" -} - -#include -#include -#include "nsINetworkInterface.h" -#include "nsINetworkInterfaceListService.h" -#include "runnable_utils.h" -#include "nsCOMPtr.h" -#include "nsMemory.h" -#include "nsThreadUtils.h" -#include "nsServiceManagerUtils.h" -#include "mozilla/SyncRunnable.h" - -namespace { -struct NetworkInterface { - struct sockaddr_in addr; - std::string name; - // See NR_INTERFACE_TYPE_* in nICEr/src/net/local_addrs.h - int type; -}; - -nsresult -GetInterfaces(std::vector* aInterfaces) -{ - MOZ_ASSERT(aInterfaces); - - // Obtain network interfaces from network manager. - nsresult rv; - nsCOMPtr listService = - do_GetService("@mozilla.org/network/interface-list-service;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - int32_t flags = - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_SUPL_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_MMS_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_IMS_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_DUN_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_FOTA_INTERFACES; - nsCOMPtr networkList; - NS_ENSURE_SUCCESS(listService->GetDataInterfaceList(flags, - getter_AddRefs(networkList)), - NS_ERROR_FAILURE); - - // Translate nsINetworkInterfaceList to NetworkInterface. - int32_t listLength; - NS_ENSURE_SUCCESS(networkList->GetNumberOfInterface(&listLength), - NS_ERROR_FAILURE); - aInterfaces->clear(); - - for (int32_t i = 0; i < listLength; i++) { - nsCOMPtr info; - if (NS_FAILED(networkList->GetInterfaceInfo(i, getter_AddRefs(info)))) { - continue; - } - - char16_t **ips = nullptr; - uint32_t *prefixs = nullptr; - uint32_t count = 0; - bool isAddressGot = false; - NetworkInterface interface; - memset(&(interface.addr), 0, sizeof(interface.addr)); - interface.addr.sin_family = AF_INET; - - if (NS_FAILED(info->GetAddresses(&ips, &prefixs, &count))) { - continue; - } - - for (uint32_t j = 0; j < count; j++) { - nsAutoString ip; - - ip.Assign(ips[j]); - if (inet_pton(AF_INET, NS_ConvertUTF16toUTF8(ip).get(), - &(interface.addr.sin_addr.s_addr)) == 1) { - isAddressGot = true; - break; - } - } - - free(prefixs); - NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(count, ips); - - if (!isAddressGot) { - continue; - } - - nsAutoString ifaceName; - if (NS_FAILED(info->GetName(ifaceName))) { - continue; - } - interface.name = NS_ConvertUTF16toUTF8(ifaceName).get(); - - int32_t type; - if (NS_FAILED(info->GetType(&type))) { - continue; - } - switch (type) { - case nsINetworkInfo::NETWORK_TYPE_WIFI: - interface.type = NR_INTERFACE_TYPE_WIFI; - break; - case nsINetworkInfo::NETWORK_TYPE_MOBILE: - interface.type = NR_INTERFACE_TYPE_MOBILE; - break; - } - - aInterfaces->push_back(interface); - } - return NS_OK; -} -} // anonymous namespace - -int -nr_stun_get_addrs(nr_local_addr aAddrs[], int aMaxAddrs, - int aDropLoopback, int aDropLinkLocal, int* aCount) -{ - nsresult rv; - int r; - - // Get network interface list. - std::vector interfaces; - nsCOMPtr mainThread = do_GetMainThread(); - mozilla::SyncRunnable::DispatchToThread( - mainThread.get(), - mozilla::WrapRunnableNMRet(&rv, &GetInterfaces, &interfaces), - false); - if (NS_FAILED(rv)) { - return R_FAILED; - } - - // Translate to nr_transport_addr. - int32_t n = 0; - size_t num_interface = std::min(interfaces.size(), (size_t)aMaxAddrs); - for (size_t i = 0; i < num_interface; ++i) { - NetworkInterface &interface = interfaces[i]; - if (nr_sockaddr_to_transport_addr((sockaddr*)&(interface.addr), - IPPROTO_UDP, 0, &(aAddrs[n].addr))) { - r_log(NR_LOG_STUN, LOG_WARNING, "Problem transforming address"); - return R_FAILED; - } - strlcpy(aAddrs[n].addr.ifname, interface.name.c_str(), - sizeof(aAddrs[n].addr.ifname)); - aAddrs[n].interface.type = interface.type; - aAddrs[n].interface.estimated_speed = 0; - n++; - } - - *aCount = n; - r = nr_stun_remove_duplicate_addrs(aAddrs, aDropLoopback, aDropLinkLocal, aCount); - if (r != 0) { - return r; - } - - for (int i = 0; i < *aCount; ++i) { - char typestr[100]; - nr_local_addr_fmt_info_string(aAddrs + i, typestr, sizeof(typestr)); - r_log(NR_LOG_STUN, LOG_DEBUG, "Address %d: %s on %s, type: %s\n", - i, aAddrs[i].addr.as_string, aAddrs[i].addr.ifname, typestr); - } - - return 0; -} diff --git a/media/mtransport/third_party/nICEr/nicer.gyp b/media/mtransport/third_party/nICEr/nicer.gyp index 84628de2d78f..5f17fe8cb820 100644 --- a/media/mtransport/third_party/nICEr/nicer.gyp +++ b/media/mtransport/third_party/nICEr/nicer.gyp @@ -7,7 +7,6 @@ # { 'variables' : { - 'build_with_gonk%': 0, 'have_ethtool_cmd_speed_hi%': 1 }, 'targets' : [ @@ -234,18 +233,6 @@ 'sources': [ ], - }], - ['moz_widget_toolkit_gonk==1', { - 'defines' : [ - 'WEBRTC_GONK', - 'NO_REG_RPC', - ], - }], - # Gonk has its own nr_stun_get_addrs implementation. - ['build_with_gonk==1', { - 'defines': [ - "USE_PLATFORM_NR_STUN_GET_ADDRS", - ] }], ['have_ethtool_cmd_speed_hi==0', { 'defines': [ diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp index b775b9336c41..834fb0479625 100644 --- a/media/webrtc/signaling/signaling.gyp +++ b/media/webrtc/signaling/signaling.gyp @@ -39,16 +39,6 @@ 'chromium_code': 1, }, - 'target_defaults': { - 'conditions': [ - ['moz_widget_toolkit_gonk==1', { - 'defines' : [ - 'WEBRTC_GONK', - ], - }], - ], - }, - 'targets': [ # @@ -296,7 +286,7 @@ 'cflags_mozilla': [ ], }], - ['OS=="android" or moz_widget_toolkit_gonk==1', { + ['OS=="android"', { 'cflags_mozilla': [ # This warning complains about important MOZ_EXPORT attributes # on forward declarations for Android API types. diff --git a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp index 315ccec39177..ccd89725192a 100644 --- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp +++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp @@ -2259,12 +2259,8 @@ JsepSessionImpl::SetupDefaultCodecs() 48000, 2, 960, -#ifdef WEBRTC_GONK // TODO Move this elsewhere to be adaptive to rate - Bug 1207925 - 16000 // B2G uses lower capture sampling rate -#else 40000 -#endif )); mSupportedCodecs.values.push_back(new JsepAudioCodecDescription( diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp index 5c2bcd16d017..07aa6f9b94c5 100644 --- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp +++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp @@ -25,10 +25,6 @@ #include "MediaStreamVideoSink.h" #include "VideoUtils.h" #include "VideoStreamTrack.h" -#ifdef WEBRTC_GONK -#include "GrallocImages.h" -#include "mozilla/layers/GrallocTextureClient.h" -#endif #include "nsError.h" #include "AudioSegment.h" diff --git a/media/webrtc/trunk/build/common.gypi b/media/webrtc/trunk/build/common.gypi index 9e94ce9615da..49c7cc8bac7d 100644 --- a/media/webrtc/trunk/build/common.gypi +++ b/media/webrtc/trunk/build/common.gypi @@ -428,7 +428,7 @@ }], # Flags to use X11 on non-Mac POSIX platforms - ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or moz_widget_toolkit_gonk==1', { + ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 'use_glib%': 0, 'use_x11%': 0, }, { diff --git a/media/webrtc/trunk/webrtc/common_audio/resampler/resampler.cc b/media/webrtc/trunk/webrtc/common_audio/resampler/resampler.cc index caaad7898b11..aa451555d825 100644 --- a/media/webrtc/trunk/webrtc/common_audio/resampler/resampler.cc +++ b/media/webrtc/trunk/webrtc/common_audio/resampler/resampler.cc @@ -23,7 +23,7 @@ // TODO(jesup) better adjust per platform ability // Note: if these are changed (higher), you may need to change the // KernelDelay values in the unit tests here and in output_mixer. -#if defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) +#if defined(WEBRTC_ANDROID) #define RESAMPLER_QUALITY 2 #else #define RESAMPLER_QUALITY 3 diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.cc b/media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.cc deleted file mode 100644 index faa93c765161..000000000000 --- a/media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.cc +++ /dev/null @@ -1 +0,0 @@ -#include "../android/audio_manager.cc" diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.h b/media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.h deleted file mode 100644 index 1b79c1e58c65..000000000000 --- a/media/webrtc/trunk/webrtc/modules/audio_device/gonk/audio_manager.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_GONK_AUDIO_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_GONK_AUDIO_MANAGER_H_ - -#include "../android/audio_manager.h" - -#endif diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc b/media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc index 1fe2cf7511f2..c6c2eba5aa95 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc +++ b/media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc @@ -29,7 +29,7 @@ namespace webrtc_adm_linux_pulse { -#if defined(__OpenBSD__) || defined(WEBRTC_GONK) +#if defined(__OpenBSD__) LATE_BINDING_SYMBOL_TABLE_DEFINE_BEGIN(PulseAudioSymbolTable, "libpulse.so") #else LATE_BINDING_SYMBOL_TABLE_DEFINE_BEGIN(PulseAudioSymbolTable, "libpulse.so.0") diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.h b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.h index 34efca3ac7fe..1d7098e7a5d4 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.h +++ b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.h @@ -17,7 +17,7 @@ #include "webrtc/modules/include/module.h" #include "webrtc/modules/video_capture/video_capture_defines.h" -#if defined(ANDROID) && !defined(WEBRTC_GONK) +#if defined(ANDROID) #include #endif diff --git a/media/webrtc/trunk/webrtc/system_wrappers/include/static_instance.h b/media/webrtc/trunk/webrtc/system_wrappers/include/static_instance.h index d6df05c92cb5..46dbdc9d0989 100644 --- a/media/webrtc/trunk/webrtc/system_wrappers/include/static_instance.h +++ b/media/webrtc/trunk/webrtc/system_wrappers/include/static_instance.h @@ -13,7 +13,7 @@ #include -#if defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) +#if defined(WEBRTC_ANDROID) #define OS_LINUX #endif #include "base/singleton.h" diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc index 51f24b690011..99736edfde49 100644 --- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc +++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc @@ -67,7 +67,7 @@ static int GetCPUInfo(CPUFeature feature) { return 0; } -#if !defined(WEBRTC_GONK) && !defined(ANDROID) +#if !defined(ANDROID) #ifdef WEBRTC_ARCH_ARM_V7 uint64_t WebRtc_GetCPUFeaturesARM(void) { return kCPUFeatureARMv7 @@ -77,7 +77,7 @@ uint64_t WebRtc_GetCPUFeaturesARM(void) { | kCPUFeatureVFPv3; } #endif // WEBRTC_ARCH_ARM_V7 -#endif // !WEBRTC_GONK && !ANDROID +#endif // !ANDROID #endif diff --git a/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h b/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h index 52f638eb568d..6ccd75886e70 100644 --- a/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h +++ b/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h @@ -60,13 +60,13 @@ enum { kVoiceEngineMaxModuleVersionSize = 960 }; // Audio processing const NoiseSuppression::Level kDefaultNsMode = NoiseSuppression::kModerate; const GainControl::Mode kDefaultAgcMode = -#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) || defined(WEBRTC_GONK) +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) GainControl::kAdaptiveDigital; #else GainControl::kAdaptiveAnalog; #endif const bool kDefaultAgcState = -#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) || defined(WEBRTC_GONK) +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) false; #else true;