generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

video_coding: When in hybrid mode, don't NACK non-base layer packets

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/334002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1237 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org
2011-12-19 18:57:14 +00:00
parent 884d8e7f4b
commit 190e88a6d3
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/video_coding/main/source/session_info.cc
View File

@@ -387,6 +387,7 @@ int VCMSessionInfo::ZeroOutSeqNum(int* seq_num_list,
return 0; return 0;
} }
// TODO(mikhal): Rename function.
int VCMSessionInfo::ZeroOutSeqNumHybrid(int* seq_num_list, int VCMSessionInfo::ZeroOutSeqNumHybrid(int* seq_num_list,
int seq_num_list_length, int seq_num_list_length,
int rtt_ms) { int rtt_ms) {
@@ -397,8 +398,8 @@ int VCMSessionInfo::ZeroOutSeqNumHybrid(int* seq_num_list,
return 0; return 0;
} }
WebRtc_Word32 index = 0; int index = 0;
// Find end point (index of entry equals the sequence number of the first // Find entrance point (index of entry equals the sequence number of the first
// packet). // packet).
for (; index < seq_num_list_length; ++index) { for (; index < seq_num_list_length; ++index) {
if (seq_num_list[index] == packets_.front().seqNum) { if (seq_num_list[index] == packets_.front().seqNum) {
@@ -411,17 +412,15 @@ int VCMSessionInfo::ZeroOutSeqNumHybrid(int* seq_num_list,
// Use the previous available. // Use the previous available.
bool base_available = false; bool base_available = false;
if ((index > 0) && (seq_num_list[index] == -1)) { if ((index > 0) && (seq_num_list[index] == -1)) {
// found first packet, for now let's go only one back // Found first packet, for now let's go only one back.
if ((seq_num_list[index - 1] == -1) || (seq_num_list[index - 1] == -2)) { if ((seq_num_list[index - 1] == -1) || (seq_num_list[index - 1] == -2)) {
// This is indeed the first packet, as previous packet was populated // This is indeed the first packet, as previous packet was populated.
base_available = true; base_available = true;
} }
} }
bool allow_nack = (!packets_.front().isFirstPacket || !base_available); bool allow_nack = (!packets_.front().isFirstPacket || !base_available);
// Zero out between first entry and end point. // Zero out between first entry and end point.
// Score place holder - based on RTT and partition (when available).
const float nack_score_threshold = 0.25f;
WebRtc_Word32 media_high_seq_num; WebRtc_Word32 media_high_seq_num;
if (HaveLastPacket()) { if (HaveLastPacket()) {
@@ -432,8 +431,12 @@ int VCMSessionInfo::ZeroOutSeqNumHybrid(int* seq_num_list,
empty_seq_num_low_ - 1: packets_.back().seqNum; empty_seq_num_low_ - 1: packets_.back().seqNum;
} }
// Place holder. // Compute session/packet scores and thresholds:
int rtt_score = 1.0f; // based on RTT and layer info (when available).
float nack_score_threshold = 0.25f;
float layer_score = TemporalId() > 0 ? 0.0f : 1.0f;
float rtt_score = 1.0f;
float score_multiplier = rtt_score * layer_score;
// Zero out between first entry and end point. // Zero out between first entry and end point.
PacketIterator it = packets_.begin(); PacketIterator it = packets_.begin();
PacketIterator prev_it = it; PacketIterator prev_it = it;
@@ -451,8 +454,8 @@ int VCMSessionInfo::ZeroOutSeqNumHybrid(int* seq_num_list,
for (int i = 0 ; i < num_lost; ++i) { for (int i = 0 ; i < num_lost; ++i) {
// Compute score of the packet. // Compute score of the packet.
float score = 1.0f; float score = 1.0f;
// Multiply internal score (importance) by external score (RTT). // Multiply internal score (packet) by score multiplier.
score *= rtt_score; score *= score_multiplier;
if (score > nack_score_threshold) { if (score > nack_score_threshold) {
allow_nack = true; allow_nack = true;
} else { } else {