summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/cast/audio_receiver/audio_receiver.cc10
-rw-r--r--media/cast/audio_sender/audio_sender.cc2
-rw-r--r--media/cast/framer/cast_message_builder.cc2
-rw-r--r--media/cast/framer/frame_id_map.cc2
-rw-r--r--media/cast/framer/framer.cc2
-rw-r--r--media/cast/net/rtp_sender/packet_storage/packet_storage.cc4
-rw-r--r--media/cast/net/rtp_sender/rtp_sender.cc6
-rw-r--r--media/cast/rtcp/rtcp_sender_unittest.cc4
-rw-r--r--media/cast/test/receiver.cc4
-rw-r--r--media/cast/test/sender.cc8
-rw-r--r--media/cast/test/transport/transport.cc2
-rw-r--r--media/cast/video_receiver/codecs/vp8/vp8_decoder.cc4
-rw-r--r--media/cast/video_receiver/video_receiver.cc10
-rw-r--r--media/cast/video_sender/codecs/vp8/vp8_encoder.cc10
-rw-r--r--media/cast/video_sender/video_sender.cc6
15 files changed, 38 insertions, 38 deletions
diff --git a/media/cast/audio_receiver/audio_receiver.cc b/media/cast/audio_receiver/audio_receiver.cc
index d1f9e13..39c02c9 100644
--- a/media/cast/audio_receiver/audio_receiver.cc
+++ b/media/cast/audio_receiver/audio_receiver.cc
@@ -176,7 +176,7 @@ void AudioReceiver::IncomingParsedRtpPacket(const uint8* payload_data,
}
if (!decryptor_->Decrypt(base::StringPiece(reinterpret_cast<const char*>(
payload_data), payload_size), &plaintext)) {
- VLOG(0) << "Decryption error";
+ LOG(ERROR) << "Decryption error";
return;
}
}
@@ -287,7 +287,7 @@ void AudioReceiver::PlayoutTimeout() {
// Since the application can post multiple AudioFrameEncodedCallback and
// we only check the next frame to play out we might have multiple timeout
// events firing after each other; however this should be a rare event.
- VLOG(1) << "Failed to retrieved a complete frame at this point in time";
+ VLOG(2) << "Failed to retrieved a complete frame at this point in time";
return;
}
@@ -315,7 +315,7 @@ void AudioReceiver::GetEncodedAudioFrame(
if (!audio_buffer_->GetEncodedAudioFrame(encoded_frame.get(),
&rtp_timestamp, &next_frame)) {
// We have no audio frames. Wait for new packet(s).
- VLOG(1) << "Wait for more audio packets in frame";
+ VLOG(2) << "Wait for more audio packets in frame";
queued_encoded_callbacks_.push_back(callback);
return;
}
@@ -351,7 +351,7 @@ bool AudioReceiver::PostEncodedAudioFrame(
cast_environment_->PostDelayedTask(CastEnvironment::MAIN, FROM_HERE,
base::Bind(&AudioReceiver::PlayoutTimeout, weak_factory_.GetWeakPtr()),
time_until_release);
- VLOG(1) << "Wait until time to playout:"
+ VLOG(2) << "Wait until time to playout:"
<< time_until_release.InMilliseconds();
return false;
}
@@ -430,7 +430,7 @@ bool AudioReceiver::DecryptAudioFrame(
}
std::string decrypted_audio_data;
if (!decryptor_->Decrypt((*audio_frame)->data, &decrypted_audio_data)) {
- VLOG(0) << "Decryption error";
+ LOG(ERROR) << "Decryption error";
// Give up on this frame, release it from jitter buffer.
audio_buffer_->ReleaseFrame((*audio_frame)->frame_id);
return false;
diff --git a/media/cast/audio_sender/audio_sender.cc b/media/cast/audio_sender/audio_sender.cc
index b1b177d..713f5b9 100644
--- a/media/cast/audio_sender/audio_sender.cc
+++ b/media/cast/audio_sender/audio_sender.cc
@@ -30,7 +30,7 @@ class LocalRtcpAudioSenderFeedback : public RtcpSenderFeedback {
if (!cast_feedback.missing_frames_and_packets_.empty()) {
audio_sender_->ResendPackets(cast_feedback.missing_frames_and_packets_);
}
- VLOG(1) << "Received audio ACK "
+ VLOG(2) << "Received audio ACK "
<< static_cast<int>(cast_feedback.ack_frame_id_);
}
diff --git a/media/cast/framer/cast_message_builder.cc b/media/cast/framer/cast_message_builder.cc
index 7d89f74..ef864ba 100644
--- a/media/cast/framer/cast_message_builder.cc
+++ b/media/cast/framer/cast_message_builder.cc
@@ -57,7 +57,7 @@ void CastMessageBuilder::CompleteFrameReceived(uint32 frame_id,
BuildPacketList();
}
// Send cast message.
- VLOG(1) << "Send cast message Ack:" << static_cast<int>(frame_id);
+ VLOG(2) << "Send cast message Ack:" << static_cast<int>(frame_id);
cast_feedback_->CastFeedback(cast_msg_);
}
diff --git a/media/cast/framer/frame_id_map.cc b/media/cast/framer/frame_id_map.cc
index bd9b943..64c2284 100644
--- a/media/cast/framer/frame_id_map.cc
+++ b/media/cast/framer/frame_id_map.cc
@@ -76,7 +76,7 @@ bool FrameIdMap::InsertPacket(const RtpCastHeader& rtp_header, bool* complete) {
waiting_for_key_ = false;
}
- VLOG(1) << "InsertPacket frame:" << frame_id
+ VLOG(3) << "InsertPacket frame:" << frame_id
<< " packet:" << static_cast<int>(rtp_header.packet_id)
<< " max packet:" << static_cast<int>(rtp_header.max_packet_id);
diff --git a/media/cast/framer/framer.cc b/media/cast/framer/framer.cc
index b06e60f..e8464c1 100644
--- a/media/cast/framer/framer.cc
+++ b/media/cast/framer/framer.cc
@@ -45,7 +45,7 @@ bool Framer::InsertPacket(const uint8* payload_data,
if (complete) {
// ACK as soon as possible.
- VLOG(1) << "Complete frame " << static_cast<int>(rtp_header.frame_id);
+ VLOG(2) << "Complete frame " << static_cast<int>(rtp_header.frame_id);
cast_msg_builder_->CompleteFrameReceived(rtp_header.frame_id,
rtp_header.is_key_frame);
}
diff --git a/media/cast/net/rtp_sender/packet_storage/packet_storage.cc b/media/cast/net/rtp_sender/packet_storage/packet_storage.cc
index 3bd8f90..0111a99 100644
--- a/media/cast/net/rtp_sender/packet_storage/packet_storage.cc
+++ b/media/cast/net/rtp_sender/packet_storage/packet_storage.cc
@@ -136,7 +136,7 @@ PacketList PacketStorage::GetPackets(
bool success = false;
if (packets_set.empty()) {
- VLOG(1) << "Missing all packets in frame " << static_cast<int>(frame_id);
+ VLOG(3) << "Missing all packets in frame " << static_cast<int>(frame_id);
uint16 packet_id = 0;
do {
@@ -165,7 +165,7 @@ bool PacketStorage::GetPacket(uint8 frame_id,
return false;
}
it->second->GetCopy(packets);
- VLOG(1) << "Resend " << static_cast<int>(frame_id)
+ VLOG(3) << "Resend " << static_cast<int>(frame_id)
<< ":" << packet_id;
return true;
}
diff --git a/media/cast/net/rtp_sender/rtp_sender.cc b/media/cast/net/rtp_sender/rtp_sender.cc
index 2b017bc..1f47648 100644
--- a/media/cast/net/rtp_sender/rtp_sender.cc
+++ b/media/cast/net/rtp_sender/rtp_sender.cc
@@ -71,7 +71,7 @@ void RtpSender::ResendPackets(
bool success = false;
if (packets_set.empty()) {
- VLOG(1) << "Missing all packets in frame " << static_cast<int>(frame_id);
+ VLOG(3) << "Missing all packets in frame " << static_cast<int>(frame_id);
uint16 packet_id = 0;
do {
@@ -80,7 +80,7 @@ void RtpSender::ResendPackets(
// Resend packet to the network.
if (success) {
- VLOG(1) << "Resend " << static_cast<int>(frame_id)
+ VLOG(3) << "Resend " << static_cast<int>(frame_id)
<< ":" << packet_id;
// Set a unique incremental sequence number for every packet.
Packet& packet = packets_to_resend.back();
@@ -98,7 +98,7 @@ void RtpSender::ResendPackets(
// Resend packet to the network.
if (success) {
- VLOG(1) << "Resend " << static_cast<int>(frame_id)
+ VLOG(3) << "Resend " << static_cast<int>(frame_id)
<< ":" << packet_id;
Packet& packet = packets_to_resend.back();
UpdateSequenceNumber(&packet);
diff --git a/media/cast/rtcp/rtcp_sender_unittest.cc b/media/cast/rtcp/rtcp_sender_unittest.cc
index 16e9ee1..7da1610 100644
--- a/media/cast/rtcp/rtcp_sender_unittest.cc
+++ b/media/cast/rtcp/rtcp_sender_unittest.cc
@@ -408,7 +408,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {
// Test empty Log message.
RtcpReceiverLogMessage receiver_log;
- VLOG(0) << " Test empty Log " ;
+ VLOG(1) << " Test empty Log " ;
rtcp_sender_->SendRtcpFromRtpReceiver(
RtcpSender::kRtcpRr | RtcpSender::kRtcpRrtr | RtcpSender::kRtcpCast |
RtcpSender::kRtcpReceiverLog,
@@ -444,7 +444,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {
receiver_log.push_back(frame_log);
- VLOG(0) << " Test Log " ;
+ VLOG(1) << " Test Log " ;
rtcp_sender_->SendRtcpFromRtpReceiver(
RtcpSender::kRtcpRr | RtcpSender::kRtcpRrtr | RtcpSender::kRtcpCast |
RtcpSender::kRtcpReceiverLog,
diff --git a/media/cast/test/receiver.cc b/media/cast/test/receiver.cc
index 1321f53..d7b4194e 100644
--- a/media/cast/test/receiver.cc
+++ b/media/cast/test/receiver.cc
@@ -166,7 +166,7 @@ class ReceiveProcess : public base::RefCountedThreadSafe<ReceiveProcess> {
// Print out the delta between frames.
if (!last_render_time_.is_null()){
base::TimeDelta time_diff = render_time - last_render_time_;
- VLOG(0) << " RenderDelay[mS] = " << time_diff.InMilliseconds();
+ VLOG(1) << " RenderDelay[mS] = " << time_diff.InMilliseconds();
}
last_render_time_ = render_time;
GetVideoFrame();
@@ -180,7 +180,7 @@ class ReceiveProcess : public base::RefCountedThreadSafe<ReceiveProcess> {
base::TimeDelta::FromMilliseconds(kFrameTimerMs);
if (!last_playout_time_.is_null()){
time_diff = playout_time - last_playout_time_;
- VLOG(0) << " ***PlayoutDelay[mS] = " << time_diff.InMilliseconds();
+ VLOG(1) << " ***PlayoutDelay[mS] = " << time_diff.InMilliseconds();
}
last_playout_time_ = playout_time;
GetAudioFrame(time_diff);
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
index f33beaa..d99fcc1 100644
--- a/media/cast/test/sender.cc
+++ b/media/cast/test/sender.cc
@@ -130,7 +130,7 @@ AudioSenderConfig GetAudioSenderConfig() {
audio_config.rtcp_c_name = "audio_sender@a.b.c.d";
- VLOG(0) << "Using OPUS 48Khz stereo at 64kbit/s";
+ VLOG(1) << "Using OPUS 48Khz stereo at 64kbit/s";
audio_config.use_external_encoder = false;
audio_config.frequency = kAudioSamplingFrequency;
audio_config.channels = kAudioChannels;
@@ -181,7 +181,7 @@ VideoSenderConfig GetVideoSenderConfig() {
video_config.use_external_encoder = false;
- VLOG(0) << "Using VP8 at 30 fps";
+ VLOG(1) << "Using VP8 at 30 fps";
video_config.min_qp = 4;
video_config.max_qp = 40;
video_config.max_frame_rate = 30;
@@ -212,7 +212,7 @@ class SendProcess {
std::string video_file_name = GetVideoFile();
video_file_ = fopen(video_file_name.c_str(), "r");
if (video_file_ == NULL) {
- VLOG(1) << "Failed to open file";
+ LOG(ERROR) << "Failed to open file";
exit(-1);
}
} else {
@@ -260,7 +260,7 @@ class SendProcess {
base::TimeDelta::FromMilliseconds(kFrameTimerMs);
base::TimeDelta elapsed_time = now - send_time_;
if (elapsed_time < video_frame_time) {
- VLOG(1) << "Wait" <<
+ VLOG(2) << "Wait" <<
(video_frame_time - elapsed_time).InMilliseconds();
test_app_thread_proxy_->PostDelayedTask(FROM_HERE,
base::Bind(&SendProcess::SendVideoFrameOnTime, base::Unretained(this),
diff --git a/media/cast/test/transport/transport.cc b/media/cast/test/transport/transport.cc
index 9312470..3cb85ed 100644
--- a/media/cast/test/transport/transport.cc
+++ b/media/cast/test/transport/transport.cc
@@ -124,7 +124,7 @@ class LocalPacketSender : public PacketSender,
if (loss_limit_ > 0) {
int r = base::RandInt(0, 100);
if (r < loss_limit_) {
- VLOG(1) << "Drop packet f:" << static_cast<int>(data[12 + 1])
+ VLOG(3) << "Drop packet f:" << static_cast<int>(data[12 + 1])
<< " p:" << static_cast<int>(data[12 + 3])
<< " m:" << static_cast<int>(data[12 + 5]);
return;
diff --git a/media/cast/video_receiver/codecs/vp8/vp8_decoder.cc b/media/cast/video_receiver/codecs/vp8/vp8_decoder.cc
index 10fcb85..1d173dd 100644
--- a/media/cast/video_receiver/codecs/vp8/vp8_decoder.cc
+++ b/media/cast/video_receiver/codecs/vp8/vp8_decoder.cc
@@ -48,7 +48,7 @@ bool Vp8Decoder::Decode(const EncodedVideoFrame* encoded_frame,
const VideoFrameDecodedCallback& frame_decoded_cb) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::VIDEO_DECODER));
const int frame_id_int = static_cast<int>(encoded_frame->frame_id);
- VLOG(1) << "VP8 decode frame:" << frame_id_int
+ VLOG(2) << "VP8 decode frame:" << frame_id_int
<< " sized:" << encoded_frame->data.size();
if (encoded_frame->data.empty()) return false;
@@ -93,7 +93,7 @@ bool Vp8Decoder::Decode(const EncodedVideoFrame* encoded_frame,
cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE, base::Bind(
LogFrameDecodedEvent, cast_environment_,encoded_frame->frame_id));
- VLOG(1) << "Decoded frame " << frame_id_int;
+ VLOG(2) << "Decoded frame " << frame_id_int;
// Frame decoded - return frame to the user via callback.
cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE,
base::Bind(frame_decoded_cb, decoded_frame, render_time));
diff --git a/media/cast/video_receiver/video_receiver.cc b/media/cast/video_receiver/video_receiver.cc
index 30a8d00f3..d422414 100644
--- a/media/cast/video_receiver/video_receiver.cc
+++ b/media/cast/video_receiver/video_receiver.cc
@@ -195,7 +195,7 @@ bool VideoReceiver::DecryptVideoFrame(
}
std::string decrypted_video_data;
if (!decryptor_->Decrypt((*video_frame)->data, &decrypted_video_data)) {
- VLOG(1) << "Decryption error";
+ LOG(ERROR) << "Decryption error";
// Give up on this frame, release it from jitter buffer.
framer_->ReleaseFrame((*video_frame)->frame_id);
return false;
@@ -267,7 +267,7 @@ bool VideoReceiver::PullEncodedVideoFrame(uint32 rtp_timestamp,
cast_environment_->PostDelayedTask(CastEnvironment::MAIN, FROM_HERE,
base::Bind(&VideoReceiver::PlayoutTimeout, weak_factory_.GetWeakPtr()),
time_until_release);
- VLOG(1) << "Wait before releasing frame "
+ VLOG(2) << "Wait before releasing frame "
<< static_cast<int>((*encoded_frame)->frame_id)
<< " time " << time_until_release.InMilliseconds();
return false;
@@ -281,7 +281,7 @@ bool VideoReceiver::PullEncodedVideoFrame(uint32 rtp_timestamp,
<< static_cast<int>((*encoded_frame)->frame_id)
<< " time_until_render:" << time_until_render.InMilliseconds();
} else {
- VLOG(1) << "Show frame "
+ VLOG(2) << "Show frame "
<< static_cast<int>((*encoded_frame)->frame_id)
<< " time_until_render:" << time_until_render.InMilliseconds();
}
@@ -305,10 +305,10 @@ void VideoReceiver::PlayoutTimeout() {
// Since the application can post multiple VideoFrameEncodedCallback and
// we only check the next frame to play out we might have multiple timeout
// events firing after each other; however this should be a rare event.
- VLOG(1) << "Failed to retrieved a complete frame at this point in time";
+ VLOG(2) << "Failed to retrieved a complete frame at this point in time";
return;
}
- VLOG(1) << "PlayoutTimeout retrieved frame "
+ VLOG(2) << "PlayoutTimeout retrieved frame "
<< static_cast<int>(encoded_frame->frame_id);
if (decryptor_ && !DecryptVideoFrame(&encoded_frame)) {
diff --git a/media/cast/video_sender/codecs/vp8/vp8_encoder.cc b/media/cast/video_sender/codecs/vp8/vp8_encoder.cc
index 099be63..b75ede1 100644
--- a/media/cast/video_sender/codecs/vp8/vp8_encoder.cc
+++ b/media/cast/video_sender/codecs/vp8/vp8_encoder.cc
@@ -192,7 +192,7 @@ bool Vp8Encoder::Encode(const scoped_refptr<media::VideoFrame>& video_frame,
encoded_image->last_referenced_frame_id = latest_frame_id_to_reference;
encoded_image->frame_id = ++last_encoded_frame_id_;
- VLOG(1) << "VP8 encoded frame:" << static_cast<int>(encoded_image->frame_id)
+ VLOG(2) << "VP8 encoded frame:" << static_cast<int>(encoded_image->frame_id)
<< " sized:" << total_size;
if (encoded_image->key_frame) {
@@ -279,15 +279,15 @@ Vp8Encoder::Vp8Buffers Vp8Encoder::GetNextBufferToUpdate() {
switch (last_used_vp8_buffer_) {
case kAltRefBuffer:
buffer_to_update = kLastBuffer;
- VLOG(1) << "VP8 update last buffer";
+ VLOG(2) << "VP8 update last buffer";
break;
case kLastBuffer:
buffer_to_update = kGoldenBuffer;
- VLOG(1) << "VP8 update golden buffer";
+ VLOG(2) << "VP8 update golden buffer";
break;
case kGoldenBuffer:
buffer_to_update = kAltRefBuffer;
- VLOG(1) << "VP8 update alt-ref buffer";
+ VLOG(2) << "VP8 update alt-ref buffer";
break;
case kNoBuffer:
DCHECK(false) << "Invalid state";
@@ -339,7 +339,7 @@ void Vp8Encoder::UpdateRates(uint32 new_bitrate) {
void Vp8Encoder::LatestFrameIdToReference(uint32 frame_id) {
if (!use_multiple_video_buffers_) return;
- VLOG(1) << "VP8 ok to reference frame:" << static_cast<int>(frame_id);
+ VLOG(2) << "VP8 ok to reference frame:" << static_cast<int>(frame_id);
for (int i = 0; i < kNumberOfVp8VideoBuffers; ++i) {
if (frame_id == used_buffers_frame_id_[i]) {
acked_frame_buffers_[i] = true;
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
index 7391fe8..15a4042 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -197,7 +197,7 @@ void VideoSender::SendEncodedVideoFrame(const EncodedVideoFrame* encoded_frame,
rtp_sender_->IncomingEncodedVideoFrame(encoded_frame, capture_time);
}
if (encoded_frame->key_frame) {
- VLOG(1) << "Send encoded key frame; frame_id:"
+ VLOG(2) << "Send encoded key frame; frame_id:"
<< static_cast<int>(encoded_frame->frame_id);
}
last_sent_frame_id_ = static_cast<int>(encoded_frame->frame_id);
@@ -415,7 +415,7 @@ void VideoSender::ReceivedAck(uint32 acked_frame_id) {
last_acked_frame_id_ = static_cast<int>(acked_frame_id);
cast_environment_->Logging()->InsertGenericEvent(kAckReceived,
acked_frame_id);
- VLOG(1) << "ReceivedAck:" << static_cast<int>(acked_frame_id);
+ VLOG(2) << "ReceivedAck:" << static_cast<int>(acked_frame_id);
last_acked_frame_id_ = acked_frame_id;
UpdateFramesInFlight();
}
@@ -432,7 +432,7 @@ void VideoSender::UpdateFramesInFlight() {
} else {
frames_in_flight = static_cast<uint32>(last_sent_frame_id_) + 1;
}
- VLOG(1) << "Frames in flight; last sent: " << last_sent_frame_id_
+ VLOG(2) << "Frames in flight; last sent: " << last_sent_frame_id_
<< " last acked:" << last_acked_frame_id_;
if (frames_in_flight >= max_unacked_frames_) {
video_encoder_controller_->SkipNextFrame(true);
generated by cgit v1.1 at 2025-02-09 20:50:50 +0000