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

Fix circular dependencies in webrtc_common.

Browse Source 
One reason for the circular deps is that common_types.h is a
historical dumping ground for various structs and defines that
are believed to be generally useful. I tried moving things out
that did not appear to be used downstream (StreamCounters,
RtpCounters etc) and moved the things that seemed used
(RtpHeader + supporting structs) to a new file api/rtp_headers.h.
This makes their place in the api more clear while moving out
the things that don't belong in the API in the first place.

I had to extract out typedefs.h from webrtc_common to resolve
another circular dependency. I believe checks includes typedefs,
but common depends on checks.

Bug: webrtc:7745
Change-Id: I725d49616b1ec0cdc8b74be7c078f7a4d46f084b
Reviewed-on: https://webrtc-review.googlesource.com/33001
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21295}
This commit is contained in:
Patrik Höglund
2017-12-15 14:40:10 +01:00
committed by Commit Bot
parent d5d0540b86
commit 3e113438b1
57 changed files with 559 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system_wrappers/BUILD.gn
View File

@ -54,6 +54,7 @@ rtc_static_library("system_wrappers") {
":field_trial_api",
":metrics_api",
"..:webrtc_common",
"../:typedefs",
"../api:optional",
"../modules:module_api_public",
"../rtc_base:checks",
@ -112,6 +113,7 @@ rtc_source_set("cpu_features_api") {
]
deps = [
"..:webrtc_common",
"../:typedefs",
]
}
@ -215,6 +217,7 @@ if (rtc_include_tests) {
":metrics_default",
":system_wrappers",
"..:webrtc_common",
"../:typedefs",
"../rtc_base:rtc_base_approved",
"../test:test_main",
"//testing/gtest",

10
system_wrappers/include/ntp_time.h
View File

@ -12,6 +12,8 @@
#include <stdint.h>
#include "rtc_base/numerics/safe_conversions.h"
namespace webrtc {
class NtpTime {
@ -40,8 +42,12 @@ class NtpTime {
// NTP standard (RFC1305, section 3.1) explicitly state value 0 is invalid.
bool Valid() const { return value_ != 0; }
uint32_t seconds() const { return value_ / kFractionsPerSecond; }
uint32_t fractions() const { return value_ % kFractionsPerSecond; }
uint32_t seconds() const {
return rtc::dchecked_cast<uint32_t>(value_ / kFractionsPerSecond);
}
uint32_t fractions() const {
return rtc::dchecked_cast<uint32_t>(value_ % kFractionsPerSecond);
}
private:
uint64_t value_;