zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Call::Config to CallConfig, keep old name as alias.

Browse Source 
We want api/peerconnectioninterface.h (and corresponding build target)
to not depend on call.h, and generally we treat Call as an internal,
non-api, class. But we need CallFactoryInterface in the api in order to
enable use of PeerConnection with or without support for media.

Making CallConfig a top-level class makes it possible to forward declare
it, together with Call, for use in callfactoryinterface.h and
peerconnectioninterface.h.

Delete the peerconnection_and_implicit_call_api target, replaced by
new target callfactory_api, to link between Call and Peerconnection.

Bug: webrtc:7504
Change-Id: I5e3978ef89bcd6705e94536f8676bcf89fc82fe1
Reviewed-on: https://webrtc-review.googlesource.com/46201
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22020}
This commit is contained in:
Niels Möller
2018-02-14 12:20:13 +01:00
committed by Commit Bot
parent fa4fe647ed
commit 8366e177e7
16 changed files with 88 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/BUILD.gn
View File

@ -340,7 +340,6 @@ if (is_ios || is_mac) {
":videotoolbox_objc",
":videotracksource_objc",
"../api:libjingle_peerconnection_api",
"../api:peerconnection_and_implicit_call_api",
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
@ -438,7 +437,6 @@ if (is_ios || is_mac) {
":native_video",
":peerconnectionfactory_base_objc",
"../api:libjingle_peerconnection_api",
"../api:peerconnection_and_implicit_call_api",
"../rtc_base:rtc_base",
]
}
@ -569,7 +567,6 @@ if (is_ios || is_mac) {
":native_video",
":videotracksource_objc",
"../api:libjingle_peerconnection_api",
"../api:peerconnection_and_implicit_call_api",
"../api:video_frame_api",
"../api/video_codecs:video_codecs_api",
"../common_video",

2
sdk/android/BUILD.gn
View File

@ -364,6 +364,7 @@ rtc_static_library("media_jni") {
deps = [
":base_jni",
"../../api:callfactory_api",
"../../api/video_codecs:video_codecs_api",
"../../call:call_interfaces",
"../../logging:rtc_event_log_api",
@ -506,7 +507,6 @@ rtc_static_library("peerconnection_jni") {
":native_api_jni",
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../api:peerconnection_and_implicit_call_api",
"../../api/video_codecs:video_codecs_api",
"../../logging:rtc_event_log_api",
"../../logging:rtc_event_log_impl_base",

2
sdk/android/src/jni/pc/media.cc
View File

@ -11,9 +11,9 @@
#include <utility>
#include "api/call/callfactoryinterface.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
#include "call/callfactoryinterface.h"
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
#include "media/engine/webrtcmediaengine.h"
#include "modules/audio_device/include/audio_device.h"