#include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
-#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/logging.h"
namespace webrtc {
return new RtpReceiverImpl(
id, clock, NullObjectRtpAudioFeedback(), incoming_messages_callback,
rtp_payload_registry,
- RTPReceiverStrategy::CreateVideoStrategy(id, incoming_payload_callback));
+ RTPReceiverStrategy::CreateVideoStrategy(incoming_payload_callback));
}
RtpReceiver* RtpReceiver::CreateAudioReceiver(
assert(incoming_messages_callback);
memset(current_remote_csrc_, 0, sizeof(current_remote_csrc_));
-
- WEBRTC_TRACE(kTraceMemory, kTraceRtpRtcp, id, "%s created", __FUNCTION__);
}
RtpReceiverImpl::~RtpReceiverImpl() {
cb_rtp_feedback_->OnIncomingCSRCChanged(id_, current_remote_csrc_[i],
false);
}
- WEBRTC_TRACE(kTraceMemory, kTraceRtpRtcp, id_, "%s deleted", __FUNCTION__);
}
RTPReceiverStrategy* RtpReceiverImpl::GetMediaReceiver() const {
if (created_new_payload) {
if (rtp_media_receiver_->OnNewPayloadTypeCreated(payload_name, payload_type,
frequency) != 0) {
- WEBRTC_TRACE(kTraceError, kTraceRtpRtcp, id_,
- "%s failed to register payload",
- __FUNCTION__);
+ LOG(LS_ERROR) << "Failed to register payload: " << payload_name << "/"
+ << payload_type;
return -1;
}
}
PayloadUnion payload_specific,
bool in_order) {
// Sanity check.
- if (payload_length < 0) {
- WEBRTC_TRACE(kTraceError, kTraceRtpRtcp, id_,
- "%s invalid argument",
- __FUNCTION__);
- return false;
- }
- int8_t first_payload_byte = 0;
- if (payload_length > 0) {
- first_payload_byte = payload[0];
- }
+ assert(payload_length >= 0);
+
// Trigger our callbacks.
CheckSSRCChanged(rtp_header);
+ int8_t first_payload_byte = payload_length > 0 ? payload[0] : 0;
bool is_red = false;
bool should_reset_statistics = false;
&should_reset_statistics) == -1) {
if (payload_length == 0) {
// OK, keep-alive packet.
- WEBRTC_TRACE(kTraceStream, kTraceRtpRtcp, id_,
- "%s received keepalive",
- __FUNCTION__);
return true;
}
- WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, id_,
- "%s received invalid payloadtype",
- __FUNCTION__);
+ LOG(LS_WARNING) << "Receiving invalid payload type.";
return false;
}
id_, rtp_header.payloadType, payload_name,
rtp_header.payload_type_frequency, channels, rate)) {
// New stream, same codec.
- WEBRTC_TRACE(kTraceError, kTraceRtpRtcp, id_,
- "Failed to create decoder for payload type:%d",
- rtp_header.payloadType);
+ LOG(LS_ERROR) << "Failed to create decoder for payload type: "
+ << rtp_header.payloadType;
}
}
}