summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/webrtc/modules/video_coding/rtp_frame_reference_finder.cc')
-rw-r--r--chromium/third_party/webrtc/modules/video_coding/rtp_frame_reference_finder.cc59
1 files changed, 29 insertions, 30 deletions
diff --git a/chromium/third_party/webrtc/modules/video_coding/rtp_frame_reference_finder.cc b/chromium/third_party/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
index b2511351f5f..09bb1d8b51b 100644
--- a/chromium/third_party/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
+++ b/chromium/third_party/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
@@ -276,8 +276,10 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
} while (last_picture_id_ != frame->picture_id);
}
+ int64_t unwrapped_tl0 = tl0_unwrapper_.Unwrap(codec_header.tl0PicIdx);
+
// Clean up info for base layers that are too old.
- uint8_t old_tl0_pic_idx = codec_header.tl0PicIdx - kMaxLayerInfo;
+ int64_t old_tl0_pic_idx = unwrapped_tl0 - kMaxLayerInfo;
auto clean_layer_info_to = layer_info_.lower_bound(old_tl0_pic_idx);
layer_info_.erase(layer_info_.begin(), clean_layer_info_to);
@@ -290,14 +292,13 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
if (frame->frame_type() == kVideoFrameKey) {
frame->num_references = 0;
- layer_info_[codec_header.tl0PicIdx].fill(-1);
- UpdateLayerInfoVp8(frame, codec_header);
+ layer_info_[unwrapped_tl0].fill(-1);
+ UpdateLayerInfoVp8(frame, unwrapped_tl0, codec_header.temporalIdx);
return kHandOff;
}
- auto layer_info_it = layer_info_.find(codec_header.temporalIdx == 0
- ? codec_header.tl0PicIdx - 1
- : codec_header.tl0PicIdx);
+ auto layer_info_it = layer_info_.find(
+ codec_header.temporalIdx == 0 ? unwrapped_tl0 - 1 : unwrapped_tl0);
// If we don't have the base layer frame yet, stash this frame.
if (layer_info_it == layer_info_.end())
@@ -308,12 +309,10 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
// base layer frame.
if (codec_header.temporalIdx == 0) {
layer_info_it =
- layer_info_
- .insert(make_pair(codec_header.tl0PicIdx, layer_info_it->second))
- .first;
+ layer_info_.emplace(unwrapped_tl0, layer_info_it->second).first;
frame->num_references = 1;
frame->references[0] = layer_info_it->second[0];
- UpdateLayerInfoVp8(frame, codec_header);
+ UpdateLayerInfoVp8(frame, unwrapped_tl0, codec_header.temporalIdx);
return kHandOff;
}
@@ -322,7 +321,7 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
frame->num_references = 1;
frame->references[0] = layer_info_it->second[0];
- UpdateLayerInfoVp8(frame, codec_header);
+ UpdateLayerInfoVp8(frame, unwrapped_tl0, codec_header.temporalIdx);
return kHandOff;
}
@@ -366,30 +365,28 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
frame->references[layer] = layer_info_it->second[layer];
}
- UpdateLayerInfoVp8(frame, codec_header);
+ UpdateLayerInfoVp8(frame, unwrapped_tl0, codec_header.temporalIdx);
return kHandOff;
}
-void RtpFrameReferenceFinder::UpdateLayerInfoVp8(
- RtpFrameObject* frame,
- const RTPVideoHeaderVP8& codec_header) {
- uint8_t tl0_pic_idx = codec_header.tl0PicIdx;
- uint8_t temporal_index = codec_header.temporalIdx;
- auto layer_info_it = layer_info_.find(tl0_pic_idx);
+void RtpFrameReferenceFinder::UpdateLayerInfoVp8(RtpFrameObject* frame,
+ int64_t unwrapped_tl0,
+ uint8_t temporal_idx) {
+ auto layer_info_it = layer_info_.find(unwrapped_tl0);
// Update this layer info and newer.
while (layer_info_it != layer_info_.end()) {
- if (layer_info_it->second[temporal_index] != -1 &&
- AheadOf<uint16_t, kPicIdLength>(layer_info_it->second[temporal_index],
+ if (layer_info_it->second[temporal_idx] != -1 &&
+ AheadOf<uint16_t, kPicIdLength>(layer_info_it->second[temporal_idx],
frame->picture_id)) {
// The frame was not newer, then no subsequent layer info have to be
// update.
break;
}
- layer_info_it->second[codec_header.temporalIdx] = frame->picture_id;
- ++tl0_pic_idx;
- layer_info_it = layer_info_.find(tl0_pic_idx);
+ layer_info_it->second[temporal_idx] = frame->picture_id;
+ ++unwrapped_tl0;
+ layer_info_it = layer_info_.find(unwrapped_tl0);
}
not_yet_received_frames_.erase(frame->picture_id);
@@ -408,7 +405,8 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
const RTPVideoHeaderVP9& codec_header = rtp_codec_header->VP9;
if (codec_header.picture_id == kNoPictureId ||
- codec_header.temporal_idx == kNoTemporalIdx) {
+ codec_header.temporal_idx == kNoTemporalIdx ||
+ codec_header.tl0_pic_idx == kNoTl0PicIdx) {
return ManageFrameGeneric(std::move(frame), codec_header.picture_id);
}
@@ -433,6 +431,7 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
return kHandOff;
}
+ int64_t unwrapped_tl0 = tl0_unwrapper_.Unwrap(codec_header.tl0_pic_idx);
if (codec_header.ss_data_available) {
// Scalability structures can only be sent with tl0 frames.
if (codec_header.temporal_idx != 0) {
@@ -446,12 +445,12 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
GofInfo info(&scalability_structures_[current_ss_idx_],
frame->picture_id);
- gof_info_.insert(std::make_pair(codec_header.tl0_pic_idx, info));
+ gof_info_.insert(std::make_pair(unwrapped_tl0, info));
}
}
// Clean up info for base layers that are too old.
- uint8_t old_tl0_pic_idx = codec_header.tl0_pic_idx - kMaxGofSaved;
+ uint8_t old_tl0_pic_idx = unwrapped_tl0 - kMaxGofSaved;
auto clean_gof_info_to = gof_info_.lower_bound(old_tl0_pic_idx);
gof_info_.erase(gof_info_.begin(), clean_gof_info_to);
@@ -461,7 +460,7 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
RTC_LOG(LS_WARNING) << "Received keyframe without scalability structure";
frame->num_references = 0;
- auto gof_info_it = gof_info_.find(codec_header.tl0_pic_idx);
+ auto gof_info_it = gof_info_.find(unwrapped_tl0);
if (gof_info_it == gof_info_.end())
return kDrop;
@@ -473,8 +472,8 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
auto gof_info_it = gof_info_.find(
(codec_header.temporal_idx == 0 && !codec_header.ss_data_available)
- ? codec_header.tl0_pic_idx - 1
- : codec_header.tl0_pic_idx);
+ ? unwrapped_tl0 - 1
+ : unwrapped_tl0);
// Gof info for this frame is not available yet, stash this frame.
if (gof_info_it == gof_info_.end())
@@ -499,7 +498,7 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
// insert if we haven't done so already.
if (codec_header.temporal_idx == 0 && !codec_header.ss_data_available) {
GofInfo new_info(info->gof, frame->picture_id);
- gof_info_.insert(std::make_pair(codec_header.tl0_pic_idx, new_info));
+ gof_info_.insert(std::make_pair(unwrapped_tl0, new_info));
}
// Clean out old info about up switch frames.