Reason for revert:
Breaks Chromium build due to the changed constructor in webrtc/p2p/client/basicportallocator.h.
Build (example): https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/19739.
Log:
FAILED: obj/remoting/protocol/protocol/port_allocator.o
/b/c/goma_client/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/remoting/protocol/protocol/port_allocator.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=\"310694-2\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DCOMPONENT_BUILD -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_GLIBCXX_DEBUG=1 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DEXPAT_RELATIVE_PATH -DGL_GLEXT_PROTOTYPES -DUSE_GLX -DUSE_EGL -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DPROTOBUF_USE_DLLS -DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0 -DFEATURE_ENABLE_VOICEMAIL -DGTEST_RELATIVE_PATH -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_LINUX -DBORINGSSL_SHARED_LIBRARY -I../.. -Igen -I../../build/linux/debian_jessie_amd64-sysroot/usr/include/glib-2.0 -I../../build/linux/debian_jessie_amd64-sysroot/usr/lib/x86_64-linux-gnu/glib-2.0/include -I../../third_party/libwebp/src -I../../third_party/khronos -I../../gpu -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/protobuf/src -I../../third_party/webrtc_overrides -I../../testing/gtest/include -I../../third_party -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/boringssl/src/include -I../../build/linux/debian_jessie_amd64-sysroot/usr/include/nss -I../../build/linux/debian_jessie_amd64-sysroot/usr/include/nspr -I../../third_party/libyuv/include -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -B../../third_party/binutils/Linux_x64/Release/bin -pthread -fcolor-diagnostics -fdebug-prefix-map=/b/c/b/Linux_Builder__dbg_/src=. -m64 -march=x86-64 -Wall -Werror -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -Wno-unused-lambda-capture -Wno-user-defined-warnings -Wno-enum-compare-switch -O0 -fno-omit-frame-pointer -g2 -gsplit-dwarf -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-auto-raw-pointer -Xclang -plugin-arg-find-bad-constructs -Xclang check-ipc -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wexit-time-destructors -Wno-header-guard -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -std=gnu++14 -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include --sysroot=../../build/linux/debian_jessie_amd64-sysroot -fno-exceptions -fvisibility-inlines-hidden -c ../../remoting/protocol/port_allocator.cc -o obj/remoting/protocol/protocol/port_allocator.o
../../remoting/protocol/port_allocator.cc:48:7: error: no matching constructor for initialization of 'cricket::BasicPortAllocator'
: BasicPortAllocator(network_manager.get(), socket_factory.get()),
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../third_party/webrtc/p2p/client/basicportallocator.h:35:12: note: candidate constructor not viable: requires single argument 'network_manager', but 2 arguments were provided
explicit BasicPortAllocator(rtc::NetworkManager* network_manager);
^
../../third_party/webrtc/p2p/client/basicportallocator.h:30:7: note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 2 were provided
class BasicPortAllocator : public PortAllocator {
^
../../third_party/webrtc/p2p/client/basicportallocator.h:32:3: note: candidate constructor not viable: requires 3 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
../../third_party/webrtc/p2p/client/basicportallocator.h:36:3: note: candidate constructor not viable: requires 3 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
../../third_party/webrtc/p2p/client/basicportallocator.h:39:3: note: candidate constructor not viable: requires 5 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
1 error generated.
Original issue's description:
> Add logging host lookups made by TurnPort to the RtcEventLog.
>
> The following fields are logged:
> - error, if there was an error.
> - elapsed time in milliseconds
>
> BUG=webrtc:8100
>
> Review-Url: https://codereview.webrtc.org/2996933003
> Cr-Commit-Position: refs/heads/master@{#19574}
> Committed: c251cb13c0
TBR=terelius@webrtc.org,pthatcher@webrtc.org,jonaso@google.com,pthatcher@google.com,solenberg@webrtc.org,deadbeef@webrtc.org,jonaso@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:8100
Review-Url: https://codereview.webrtc.org/3012473002
Cr-Commit-Position: refs/heads/master@{#19578}
317 lines
9.1 KiB
Protocol Buffer
317 lines
9.1 KiB
Protocol Buffer
syntax = "proto2";
|
|
option optimize_for = LITE_RUNTIME;
|
|
package webrtc.rtclog;
|
|
|
|
enum MediaType {
|
|
ANY = 0;
|
|
AUDIO = 1;
|
|
VIDEO = 2;
|
|
DATA = 3;
|
|
}
|
|
|
|
// This is the main message to dump to a file, it can contain multiple event
|
|
// messages, but it is possible to append multiple EventStreams (each with a
|
|
// single event) to a file.
|
|
// This has the benefit that there's no need to keep all data in memory.
|
|
message EventStream {
|
|
repeated Event stream = 1;
|
|
}
|
|
|
|
message Event {
|
|
// required - Elapsed wallclock time in us since the start of the log.
|
|
optional int64 timestamp_us = 1;
|
|
|
|
// The different types of events that can occur, the UNKNOWN_EVENT entry
|
|
// is added in case future EventTypes are added, in that case old code will
|
|
// receive the new events as UNKNOWN_EVENT.
|
|
enum EventType {
|
|
UNKNOWN_EVENT = 0;
|
|
LOG_START = 1;
|
|
LOG_END = 2;
|
|
RTP_EVENT = 3;
|
|
RTCP_EVENT = 4;
|
|
AUDIO_PLAYOUT_EVENT = 5;
|
|
LOSS_BASED_BWE_UPDATE = 6;
|
|
DELAY_BASED_BWE_UPDATE = 7;
|
|
VIDEO_RECEIVER_CONFIG_EVENT = 8;
|
|
VIDEO_SENDER_CONFIG_EVENT = 9;
|
|
AUDIO_RECEIVER_CONFIG_EVENT = 10;
|
|
AUDIO_SENDER_CONFIG_EVENT = 11;
|
|
AUDIO_NETWORK_ADAPTATION_EVENT = 16;
|
|
BWE_PROBE_CLUSTER_CREATED_EVENT = 17;
|
|
BWE_PROBE_RESULT_EVENT = 18;
|
|
}
|
|
|
|
// required - Indicates the type of this event
|
|
optional EventType type = 2;
|
|
|
|
oneof subtype {
|
|
// required if type == RTP_EVENT
|
|
RtpPacket rtp_packet = 3;
|
|
|
|
// required if type == RTCP_EVENT
|
|
RtcpPacket rtcp_packet = 4;
|
|
|
|
// required if type == AUDIO_PLAYOUT_EVENT
|
|
AudioPlayoutEvent audio_playout_event = 5;
|
|
|
|
// required if type == LOSS_BASED_BWE_UPDATE
|
|
LossBasedBweUpdate loss_based_bwe_update = 6;
|
|
|
|
// required if type == DELAY_BASED_BWE_UPDATE
|
|
DelayBasedBweUpdate delay_based_bwe_update = 7;
|
|
|
|
// required if type == VIDEO_RECEIVER_CONFIG_EVENT
|
|
VideoReceiveConfig video_receiver_config = 8;
|
|
|
|
// required if type == VIDEO_SENDER_CONFIG_EVENT
|
|
VideoSendConfig video_sender_config = 9;
|
|
|
|
// required if type == AUDIO_RECEIVER_CONFIG_EVENT
|
|
AudioReceiveConfig audio_receiver_config = 10;
|
|
|
|
// required if type == AUDIO_SENDER_CONFIG_EVENT
|
|
AudioSendConfig audio_sender_config = 11;
|
|
|
|
// required if type == AUDIO_NETWORK_ADAPTATION_EVENT
|
|
AudioNetworkAdaptation audio_network_adaptation = 16;
|
|
|
|
// required if type == BWE_PROBE_CLUSTER_CREATED_EVENT
|
|
BweProbeCluster probe_cluster = 17;
|
|
|
|
// required if type == BWE_PROBE_RESULT_EVENT
|
|
BweProbeResult probe_result = 18;
|
|
}
|
|
}
|
|
|
|
message RtpPacket {
|
|
// required - True if the packet is incoming w.r.t. the user logging the data
|
|
optional bool incoming = 1;
|
|
|
|
optional MediaType type = 2 [deprecated = true];
|
|
|
|
// required - The size of the packet including both payload and header.
|
|
optional uint32 packet_length = 3;
|
|
|
|
// required - The RTP header only.
|
|
optional bytes header = 4;
|
|
|
|
// optional - The probe cluster id.
|
|
optional uint32 probe_cluster_id = 5;
|
|
|
|
// Do not add code to log user payload data without a privacy review!
|
|
}
|
|
|
|
message RtcpPacket {
|
|
// required - True if the packet is incoming w.r.t. the user logging the data
|
|
optional bool incoming = 1;
|
|
|
|
optional MediaType type = 2 [deprecated = true];
|
|
|
|
// required - The whole packet including both payload and header.
|
|
optional bytes packet_data = 3;
|
|
}
|
|
|
|
message AudioPlayoutEvent {
|
|
// TODO(ivoc): Rename, we currently use the "remote" ssrc, i.e. identifying
|
|
// the receive stream, while local_ssrc identifies the send stream, if any.
|
|
// required - The SSRC of the audio stream associated with the playout event.
|
|
optional uint32 local_ssrc = 2;
|
|
}
|
|
|
|
message LossBasedBweUpdate {
|
|
// required - Bandwidth estimate (in bps) after the update.
|
|
optional int32 bitrate_bps = 1;
|
|
|
|
// required - Fraction of lost packets since last receiver report
|
|
// computed as floor( 256 * (#lost_packets / #total_packets) ).
|
|
// The possible values range from 0 to 255.
|
|
optional uint32 fraction_loss = 2;
|
|
|
|
// TODO(terelius): Is this really needed? Remove or make optional?
|
|
// required - Total number of packets that the BWE update is based on.
|
|
optional int32 total_packets = 3;
|
|
}
|
|
|
|
message DelayBasedBweUpdate {
|
|
enum DetectorState {
|
|
BWE_NORMAL = 0;
|
|
BWE_UNDERUSING = 1;
|
|
BWE_OVERUSING = 2;
|
|
}
|
|
|
|
// required - Bandwidth estimate (in bps) after the update.
|
|
optional int32 bitrate_bps = 1;
|
|
|
|
// required - The state of the overuse detector.
|
|
optional DetectorState detector_state = 2;
|
|
}
|
|
|
|
// TODO(terelius): Video and audio streams could in principle share SSRC,
|
|
// so identifying a stream based only on SSRC might not work.
|
|
// It might be better to use a combination of SSRC and media type
|
|
// or SSRC and port number, but for now we will rely on SSRC only.
|
|
message VideoReceiveConfig {
|
|
// required - Synchronization source (stream identifier) to be received.
|
|
optional uint32 remote_ssrc = 1;
|
|
// required - Sender SSRC used for sending RTCP (such as receiver reports).
|
|
optional uint32 local_ssrc = 2;
|
|
|
|
// Compound mode is described by RFC 4585 and reduced-size
|
|
// RTCP mode is described by RFC 5506.
|
|
enum RtcpMode {
|
|
RTCP_COMPOUND = 1;
|
|
RTCP_REDUCEDSIZE = 2;
|
|
}
|
|
// required - RTCP mode to use.
|
|
optional RtcpMode rtcp_mode = 3;
|
|
|
|
// required - Receiver estimated maximum bandwidth.
|
|
optional bool remb = 4;
|
|
|
|
// Map from video RTP payload type -> RTX config.
|
|
repeated RtxMap rtx_map = 5;
|
|
|
|
// RTP header extensions used for the received stream.
|
|
repeated RtpHeaderExtension header_extensions = 6;
|
|
|
|
// List of decoders associated with the stream.
|
|
repeated DecoderConfig decoders = 7;
|
|
}
|
|
|
|
// Maps decoder names to payload types.
|
|
message DecoderConfig {
|
|
// required
|
|
optional string name = 1;
|
|
|
|
// required
|
|
optional int32 payload_type = 2;
|
|
}
|
|
|
|
// Maps RTP header extension names to numerical IDs.
|
|
message RtpHeaderExtension {
|
|
// required
|
|
optional string name = 1;
|
|
|
|
// required
|
|
optional int32 id = 2;
|
|
}
|
|
|
|
// RTX settings for incoming video payloads that may be received.
|
|
// RTX is disabled if there's no config present.
|
|
message RtxConfig {
|
|
// required - SSRC to use for the RTX stream.
|
|
optional uint32 rtx_ssrc = 1;
|
|
|
|
// required - Payload type to use for the RTX stream.
|
|
optional int32 rtx_payload_type = 2;
|
|
}
|
|
|
|
message RtxMap {
|
|
// required
|
|
optional int32 payload_type = 1;
|
|
|
|
// required
|
|
optional RtxConfig config = 2;
|
|
}
|
|
|
|
message VideoSendConfig {
|
|
// Synchronization source (stream identifier) for outgoing stream.
|
|
// One stream can have several ssrcs for e.g. simulcast.
|
|
// At least one ssrc is required.
|
|
repeated uint32 ssrcs = 1;
|
|
|
|
// RTP header extensions used for the outgoing stream.
|
|
repeated RtpHeaderExtension header_extensions = 2;
|
|
|
|
// List of SSRCs for retransmitted packets.
|
|
repeated uint32 rtx_ssrcs = 3;
|
|
|
|
// required if rtx_ssrcs is used - Payload type for retransmitted packets.
|
|
optional int32 rtx_payload_type = 4;
|
|
|
|
// required - Encoder associated with the stream.
|
|
optional EncoderConfig encoder = 5;
|
|
}
|
|
|
|
// Maps encoder names to payload types.
|
|
message EncoderConfig {
|
|
// required
|
|
optional string name = 1;
|
|
|
|
// required
|
|
optional int32 payload_type = 2;
|
|
}
|
|
|
|
message AudioReceiveConfig {
|
|
// required - Synchronization source (stream identifier) to be received.
|
|
optional uint32 remote_ssrc = 1;
|
|
|
|
// required - Sender SSRC used for sending RTCP (such as receiver reports).
|
|
optional uint32 local_ssrc = 2;
|
|
|
|
// RTP header extensions used for the received audio stream.
|
|
repeated RtpHeaderExtension header_extensions = 3;
|
|
}
|
|
|
|
message AudioSendConfig {
|
|
// required - Synchronization source (stream identifier) for outgoing stream.
|
|
optional uint32 ssrc = 1;
|
|
|
|
// RTP header extensions used for the outgoing audio stream.
|
|
repeated RtpHeaderExtension header_extensions = 2;
|
|
}
|
|
|
|
message AudioNetworkAdaptation {
|
|
// Bit rate that the audio encoder is operating at.
|
|
optional int32 bitrate_bps = 1;
|
|
|
|
// Frame length that each encoded audio packet consists of.
|
|
optional int32 frame_length_ms = 2;
|
|
|
|
// Packet loss fraction that the encoder's forward error correction (FEC) is
|
|
// optimized for.
|
|
optional float uplink_packet_loss_fraction = 3;
|
|
|
|
// Whether forward error correction (FEC) is turned on or off.
|
|
optional bool enable_fec = 4;
|
|
|
|
// Whether discontinuous transmission (DTX) is turned on or off.
|
|
optional bool enable_dtx = 5;
|
|
|
|
// Number of audio channels that each encoded packet consists of.
|
|
optional uint32 num_channels = 6;
|
|
}
|
|
|
|
message BweProbeCluster {
|
|
// required - The id of this probe cluster.
|
|
optional uint32 id = 1;
|
|
|
|
// required - The bitrate in bps that this probe cluster is meant to probe.
|
|
optional uint64 bitrate_bps = 2;
|
|
|
|
// required - The minimum number of packets used to probe the given bitrate.
|
|
optional uint32 min_packets = 3;
|
|
|
|
// required - The minimum number of bytes used to probe the given bitrate.
|
|
optional uint32 min_bytes = 4;
|
|
}
|
|
|
|
message BweProbeResult {
|
|
// required - The id of this probe cluster.
|
|
optional uint32 id = 1;
|
|
|
|
enum ResultType {
|
|
SUCCESS = 0;
|
|
INVALID_SEND_RECEIVE_INTERVAL = 1;
|
|
INVALID_SEND_RECEIVE_RATIO = 2;
|
|
TIMEOUT = 3;
|
|
}
|
|
|
|
// required - The result of this probing attempt.
|
|
optional ResultType result = 2;
|
|
|
|
// optional - but required if result == SUCCESS. The resulting bitrate in bps.
|
|
optional uint64 bitrate_bps = 3;
|
|
}
|