aboutsummaryrefslogtreecommitdiff
path: root/cast/streaming
diff options
context:
space:
mode:
Diffstat (limited to 'cast/streaming')
-rw-r--r--cast/streaming/offer_messages.cc2
-rw-r--r--cast/streaming/receiver.cc30
-rw-r--r--cast/streaming/receiver_session.cc4
-rw-r--r--cast/streaming/rpc_messenger.cc9
-rw-r--r--cast/streaming/session_messenger.cc12
5 files changed, 17 insertions, 40 deletions
diff --git a/cast/streaming/offer_messages.cc b/cast/streaming/offer_messages.cc
index 1795a692..3e816026 100644
--- a/cast/streaming/offer_messages.cc
+++ b/cast/streaming/offer_messages.cc
@@ -360,7 +360,7 @@ Error Offer::TryParse(const Json::Value& root, Offer* out) {
if (!error.ok()) {
if (error.code() == Error::Code::kUnknownCodec) {
- OSP_DVLOG << "Dropping audio stream due to unknown codec: " << error;
+ OSP_VLOG << "Dropping audio stream due to unknown codec: " << error;
continue;
} else {
return error;
diff --git a/cast/streaming/receiver.cc b/cast/streaming/receiver.cc
index ee2b0bc5..d08c181c 100644
--- a/cast/streaming/receiver.cc
+++ b/cast/streaming/receiver.cc
@@ -105,13 +105,11 @@ int Receiver::AdvanceToNextFrame() {
const EncryptedFrame& encrypted_frame =
entry.collector.PeekAtAssembledFrame();
if (f == immediate_next_frame) { // Typical case.
- OSP_DVLOG << "AdvanceToNextFrame: Next in sequence (" << f << ')';
return FrameCrypto::GetPlaintextSize(encrypted_frame);
}
if (encrypted_frame.dependency != EncodedFrame::DEPENDS_ON_ANOTHER) {
// Found a frame after skipping past some frames. Drop the ones being
// skipped, advancing |last_frame_consumed_| before returning.
- OSP_DVLOG << "AdvanceToNextFrame: Skipping-ahead → " << f;
DropAllFramesBefore(f);
return FrameCrypto::GetPlaintextSize(encrypted_frame);
}
@@ -139,8 +137,6 @@ int Receiver::AdvanceToNextFrame() {
}
}
- OSP_DVLOG << "AdvanceToNextFrame: No frames ready. Last consumed was "
- << last_frame_consumed_ << '.';
return kNoFramesReady;
}
@@ -161,14 +157,13 @@ EncodedFrame Receiver::ConsumeNextFrame(absl::Span<uint8_t> buffer) {
frame.reference_time =
*entry.estimated_capture_time + ResolveTargetPlayoutDelay(frame_id);
- OSP_DVLOG << "ConsumeNextFrame → " << frame.frame_id << ": "
- << frame.data.size() << " payload bytes, RTP Timestamp "
- << frame.rtp_timestamp
- .ToTimeSinceOrigin<microseconds>(rtp_timebase_)
- .count()
- << " µs, to play-out "
- << to_microseconds(frame.reference_time - now_()).count()
- << " µs from now.";
+ OSP_VLOG << "ConsumeNextFrame → " << frame.frame_id << ": "
+ << frame.data.size() << " payload bytes, RTP Timestamp "
+ << frame.rtp_timestamp.ToTimeSinceOrigin<microseconds>(rtp_timebase_)
+ .count()
+ << " µs, to play-out "
+ << to_microseconds(frame.reference_time - now_()).count()
+ << " µs from now.";
entry.Reset();
last_frame_consumed_ = frame_id;
@@ -205,8 +200,6 @@ void Receiver::OnReceivedRtpPacket(Clock::time_point arrival_time,
const FrameId max_allowed_frame_id =
last_frame_consumed_ + kMaxUnackedFrames;
if (part->frame_id > max_allowed_frame_id) {
- OSP_DVLOG << "Dropping RTP packet for " << part->frame_id
- << ": Too many frames are already in-flight.";
return;
}
do {
@@ -214,7 +207,6 @@ void Receiver::OnReceivedRtpPacket(Clock::time_point arrival_time,
GetQueueEntry(latest_frame_expected_)
.collector.set_frame_id(latest_frame_expected_);
} while (latest_frame_expected_ < part->frame_id);
- OSP_DVLOG << "Advanced latest frame expected to " << latest_frame_expected_;
}
// Start-up edge case: Blatantly drop the first packet of all frames until the
@@ -262,9 +254,6 @@ void Receiver::OnReceivedRtpPacket(Clock::time_point arrival_time,
// If a target playout delay change was included in this packet, record it.
if (part->new_playout_delay > milliseconds::zero()) {
- OSP_DVLOG << "Target playout delay changes to "
- << part->new_playout_delay.count() << " ms, as of "
- << part->frame_id;
RecordNewTargetPlayoutDelay(part->frame_id, part->new_playout_delay);
}
@@ -321,9 +310,6 @@ void Receiver::OnReceivedRtcpPacket(Clock::time_point arrival_time,
const Clock::duration measured_offset =
arrival_time - last_sender_report_->reference_time;
smoothed_clock_offset_.Update(arrival_time, measured_offset);
- OSP_DVLOG << "Received Sender Report: Local clock is ahead of Sender's by "
- << to_microseconds(smoothed_clock_offset_.Current()).count()
- << " µs (minus one-way network transit time).";
RtcpReportBlock report;
report.ssrc = rtcp_session_.sender_ssrc();
@@ -356,7 +342,6 @@ void Receiver::SendRtcp() {
packet_router_->SendRtcpPacket(rtcp_builder_.BuildPacket(
last_rtcp_send_time_,
absl::Span<uint8_t>(rtcp_buffer_.get(), rtcp_buffer_capacity_)));
- OSP_DVLOG << "Sent RTCP packet.";
// Schedule the automatic sending of another RTCP packet, if this method is
// not called within some bounded amount of time. While incomplete frames
@@ -434,7 +419,6 @@ void Receiver::AdvanceCheckpoint(FrameId new_checkpoint) {
new_checkpoint = next;
}
- OSP_DVLOG << "Advancing checkpoint to " << new_checkpoint;
set_checkpoint_frame(new_checkpoint);
rtcp_builder_.SetPlayoutDelay(ResolveTargetPlayoutDelay(new_checkpoint));
SendRtcp();
diff --git a/cast/streaming/receiver_session.cc b/cast/streaming/receiver_session.cc
index 056bbabf..8082af8e 100644
--- a/cast/streaming/receiver_session.cc
+++ b/cast/streaming/receiver_session.cc
@@ -33,8 +33,8 @@ std::unique_ptr<Stream> SelectStream(
for (auto codec : preferred_codecs) {
for (const Stream& offered_stream : offered_streams) {
if (offered_stream.codec == codec) {
- OSP_DVLOG << "Selected " << CodecToString(codec)
- << " as codec for streaming";
+ OSP_VLOG << "Selected " << CodecToString(codec)
+ << " as codec for streaming";
return std::make_unique<Stream>(offered_stream);
}
}
diff --git a/cast/streaming/rpc_messenger.cc b/cast/streaming/rpc_messenger.cc
index 63176f7c..3ae6c548 100644
--- a/cast/streaming/rpc_messenger.cc
+++ b/cast/streaming/rpc_messenger.cc
@@ -59,12 +59,10 @@ void RpcMessenger::RegisterMessageReceiverCallback(
ReceiveMessageCallback callback) {
OSP_DCHECK(receive_callbacks_.find(handle) == receive_callbacks_.end())
<< "must deregister before re-registering";
- OSP_DVLOG << "registering handle: " << handle;
receive_callbacks_.emplace_back(handle, std::move(callback));
}
void RpcMessenger::UnregisterMessageReceiverCallback(RpcMessenger::Handle handle) {
- OSP_DVLOG << "unregistering handle: " << handle;
receive_callbacks_.erase_key(handle);
}
@@ -76,19 +74,18 @@ void RpcMessenger::ProcessMessageFromRemote(const uint8_t* message,
<< "\"";
return;
}
- OSP_DVLOG << "Received RPC message: " << *rpc;
const auto entry = receive_callbacks_.find(rpc->handle());
if (entry == receive_callbacks_.end()) {
- OSP_DVLOG << "Dropping message due to unregistered handle: "
- << rpc->handle();
+ OSP_VLOG << "Dropping message due to unregistered handle: "
+ << rpc->handle();
return;
}
entry->second(std::move(rpc));
}
void RpcMessenger::SendMessageToRemote(const RpcMessage& rpc) {
- OSP_DVLOG << "Sending RPC message: " << rpc;
+ OSP_VLOG << "Sending RPC message: " << rpc;
std::vector<uint8_t> message(rpc.ByteSizeLong());
rpc.SerializeToArray(message.data(), message.size());
send_message_cb_(std::move(message));
diff --git a/cast/streaming/session_messenger.cc b/cast/streaming/session_messenger.cc
index 389d87bb..a612b68d 100644
--- a/cast/streaming/session_messenger.cc
+++ b/cast/streaming/session_messenger.cc
@@ -23,7 +23,7 @@ void ReplyIfTimedOut(
replies) {
for (auto it = replies->begin(); it != replies->end(); ++it) {
if (it->first == sequence_number) {
- OSP_DVLOG
+ OSP_VLOG
<< "Replying with empty message due to timeout for sequence number: "
<< sequence_number;
it->second(ReceiverMessage{reply_type, sequence_number});
@@ -57,9 +57,9 @@ Error SessionMessenger::SendMessage(const std::string& destination_id,
if (body_or_error.is_error()) {
return std::move(body_or_error.error());
}
- OSP_DVLOG << "Sending message: DESTINATION[" << destination_id
- << "], NAMESPACE[" << namespace_ << "], BODY:\n"
- << body_or_error.value();
+ OSP_VLOG << "Sending message: DESTINATION[" << destination_id
+ << "], NAMESPACE[" << namespace_ << "], BODY:\n"
+ << body_or_error.value();
message_port_->PostMessage(destination_id, namespace_, body_or_error.value());
return Error::None();
}
@@ -180,8 +180,6 @@ void SenderSessionMessenger::OnMessage(const std::string& source_id,
return;
}
- OSP_DVLOG << "Received a valid reply from " << source_id
- << ". Reply body: " << message;
it->second(std::move(receiver_message.value({})));
// Calling the function callback may result in the checksum of the pointed
@@ -268,8 +266,6 @@ void ReceiverSessionMessenger::OnMessage(const std::string& source_id,
if (it == callbacks_.end()) {
OSP_DLOG_INFO << "Received message without a callback, dropping";
} else {
- OSP_DVLOG << "Received valid message from " << source_id
- << ", executing callback. Message body: " << message;
it->second(sender_message.value());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 11:05:14 +0000