zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log a message when a key frame packet is received

Browse Source 
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1518004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4089 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
hclam@chromium.org
2013-05-22 21:18:59 +00:00
parent 46db413e22
commit 8c49c1eab3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/main/source/jitter_buffer.cc
View File

@ -601,6 +601,7 @@ VCMFrameBufferEnum VCMJitterBuffer::GetFrame(const VCMPacket& packet,
return kNoError; return kNoError;
} }
// No free frame! Try to reclaim some... // No free frame! Try to reclaim some...
LOG_F(LS_INFO) << "Unable to get empty frame; Recycling.";
RecycleFramesUntilKeyFrame(); RecycleFramesUntilKeyFrame();
*frame = GetEmptyFrame(); *frame = GetEmptyFrame();
@ -847,6 +848,7 @@ uint16_t* VCMJitterBuffer::GetNackList(uint16_t* nack_list_size,
if (!first_frame_is_key) { if (!first_frame_is_key) {
const bool have_non_empty_frame = frame_list_.end() != find_if( const bool have_non_empty_frame = frame_list_.end() != find_if(
frame_list_.begin(), frame_list_.end(), HasNonEmptyState); frame_list_.begin(), frame_list_.end(), HasNonEmptyState);
LOG_F(LS_INFO) << "First frame is not key; Recycling.";
bool found_key_frame = RecycleFramesUntilKeyFrame(); bool found_key_frame = RecycleFramesUntilKeyFrame();
if (!found_key_frame) { if (!found_key_frame) {
*request_key_frame = have_non_empty_frame; *request_key_frame = have_non_empty_frame;

5
webrtc/modules/video_coding/main/source/receiver.cc
View File

@ -77,6 +77,11 @@ void VCMReceiver::UpdateRtt(uint32_t rtt) {
int32_t VCMReceiver::InsertPacket(const VCMPacket& packet, int32_t VCMReceiver::InsertPacket(const VCMPacket& packet,
uint16_t frame_width, uint16_t frame_width,
uint16_t frame_height) { 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);
// Insert the packet into the jitter buffer. The packet can either be empty or // Insert the packet into the jitter buffer. The packet can either be empty or
// contain media at this point. // contain media at this point.
bool retransmitted = false; bool retransmitted = false;