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

Revert "Remove nogncheck and add proper dependencies."

Browse Source 
This reverts commit 9b045fa316665fadff25147761fb9a6052db0ccc.

Reason for revert: Pulls opus into data channel only WebRTC

Original change's description:
> Remove nogncheck and add proper dependencies.
> 
> Bug: webrtc:8733
> Change-Id: I7c16f808a07d5f31a6d2a2e62c84b439e835bce1
> Reviewed-on: https://webrtc-review.googlesource.com/40160
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21680}

TBR=phoglund@webrtc.org,hta@webrtc.org

Change-Id: Ice7c3f062c8b112933bde75008e15deb97a48aae
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8733
Reviewed-on: https://webrtc-review.googlesource.com/41000
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21683}
This commit is contained in:
Patrik Höglund
2018-01-18 19:15:38 +00:00
committed by Commit Bot
parent 3ca452be48
commit 42805f36e3
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pc/BUILD.gn
View File

@ -189,11 +189,8 @@ rtc_static_library("peerconnection") {
"../call:call_interfaces", "../call:call_interfaces",
"../common_video:common_video", "../common_video:common_video",
"../logging:rtc_event_log_api", "../logging:rtc_event_log_api",
"../media:rtc_audio_video",
"../media:rtc_data", "../media:rtc_data",
"../media:rtc_internal_video_codecs",
"../media:rtc_media_base", "../media:rtc_media_base",
"../modules/audio_device",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",

3
pc/channel.cc
View File

@ -26,6 +26,9 @@
#include "rtc_base/networkroute.h" #include "rtc_base/networkroute.h"
#include "rtc_base/ptr_util.h" #include "rtc_base/ptr_util.h"
#include "rtc_base/trace_event.h" #include "rtc_base/trace_event.h"
// Adding 'nogncheck' to disable the gn include headers check to support modular
// WebRTC build targets.
#include "media/engine/webrtcvoiceengine.h" // nogncheck
#include "p2p/base/packettransportinternal.h" #include "p2p/base/packettransportinternal.h"
#include "pc/channelmanager.h" #include "pc/channelmanager.h"
#include "pc/rtpmediautils.h" #include "pc/rtpmediautils.h"

12
pc/peerconnectionfactory.cc
View File

@ -25,10 +25,14 @@
#include "rtc_base/bind.h" #include "rtc_base/bind.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/ptr_util.h" #include "rtc_base/ptr_util.h"
#include "media/engine/webrtcmediaengine.h" // Adding 'nogncheck' to disable the gn include headers check to support modular
#include "media/engine/webrtcvideodecoderfactory.h" // WebRTC build targets.
#include "media/engine/webrtcvideoencoderfactory.h" // TODO(zhihuang): This wouldn't be necessary if the interface and
#include "modules/audio_device/include/audio_device.h" // implementation of the media engine were in separate build targets.
#include "media/engine/webrtcmediaengine.h" // nogncheck
#include "media/engine/webrtcvideodecoderfactory.h" // nogncheck
#include "media/engine/webrtcvideoencoderfactory.h" // nogncheck
#include "modules/audio_device/include/audio_device.h" // nogncheck
#include "p2p/base/basicpacketsocketfactory.h" #include "p2p/base/basicpacketsocketfactory.h"
#include "p2p/client/basicportallocator.h" #include "p2p/client/basicportallocator.h"
#include "pc/audiotrack.h" #include "pc/audiotrack.h"

5
pc/rtpsender.h
View File

@ -23,8 +23,9 @@
#include "api/rtpsenderinterface.h" #include "api/rtpsenderinterface.h"
#include "rtc_base/basictypes.h" #include "rtc_base/basictypes.h"
#include "rtc_base/criticalsection.h" #include "rtc_base/criticalsection.h"
#include "media/base/audiosource.h" // Adding 'nogncheck' to disable the gn include headers check to support modular
#include "pc/channel.h" // WebRTC build targets.
#include "media/base/audiosource.h" // nogncheck
#include "pc/dtmfsender.h" #include "pc/dtmfsender.h"
#include "pc/statscollector.h" #include "pc/statscollector.h"