From a7dc37d568c0a451fbcc6b239c483941c49bd64c Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Thu, 23 May 2013 07:21:05 +0000 Subject: [PATCH] Log the type of recycled frames. Also correct the logging of incoming key frame packets. BUG=1814 R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1537004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4090 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/video_coding/main/source/jitter_buffer.cc | 5 +++-- webrtc/modules/video_coding/main/source/receiver.cc | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.cc b/webrtc/modules/video_coding/main/source/jitter_buffer.cc index 6d4bdaef1a..8e3d6adf92 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.cc +++ b/webrtc/modules/video_coding/main/source/jitter_buffer.cc @@ -1101,8 +1101,9 @@ bool VCMJitterBuffer::RecycleFramesUntilKeyFrame() { FrameList::iterator it = frame_list_.begin(); WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding, VCMId(vcm_id_, receiver_id_), - "Jitter buffer drop count:%d, low_seq %d", drop_count_, - (*it)->GetLowSeqNum()); + "Jitter buffer drop count:%d, low_seq %d, frame type: %s", + drop_count_, (*it)->GetLowSeqNum(), + (*it)->FrameType() == kVideoFrameKey ? "key" : "delta"); TRACE_EVENT_INSTANT0("webrtc", "JB::RecycleFramesUntilKeyFrame"); ReleaseFrameIfNotDecoding(*it); it = frame_list_.erase(it); diff --git a/webrtc/modules/video_coding/main/source/receiver.cc b/webrtc/modules/video_coding/main/source/receiver.cc index 0e5593b210..45aa3dca7c 100644 --- a/webrtc/modules/video_coding/main/source/receiver.cc +++ b/webrtc/modules/video_coding/main/source/receiver.cc @@ -77,10 +77,12 @@ void VCMReceiver::UpdateRtt(uint32_t rtt) { int32_t VCMReceiver::InsertPacket(const VCMPacket& packet, uint16_t frame_width, uint16_t frame_height) { - WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCoding, - VCMId(vcm_id_, receiver_id_), - "Inserting key frame packet seqnum=%u, timestamp=%u", - packet.seqNum, packet.timestamp); + if (packet.frameType == kVideoFrameKey) { + WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCoding, + VCMId(vcm_id_, receiver_id_), + "Inserting key frame packet seqnum=%u, timestamp=%u", + packet.seqNum, packet.timestamp); + } // Insert the packet into the jitter buffer. The packet can either be empty or // contain media at this point.