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

Calculate VP9 references to wrap at kPicIdLength instead of 16 bits.

Browse Source 
Bug: webrtc:8293
Change-Id: Iedc09a10548c2112e99247a5845a02c1bd3e7b80
Reviewed-on: https://webrtc-review.googlesource.com/4200
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20017}
This commit is contained in:
philipel
2017-09-27 18:03:50 +02:00
committed by Commit Bot
parent 78ba000d7e
commit a81403fd16
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/video_coding/rtp_frame_reference_finder.cc
View File

@ -422,7 +422,7 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
frame->num_references = codec_header.num_ref_pics;
for (size_t i = 0; i < frame->num_references; ++i) {
frame->references[i] =
Subtract<1 << 16>(frame->picture_id, codec_header.pid_diff[i]);
Subtract<kPicIdLength>(frame->picture_id, codec_header.pid_diff[i]);
}
UnwrapPictureIds(frame);

7
modules/video_coding/rtp_frame_reference_finder_unittest.cc
View File

@ -1313,5 +1313,12 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9FlexibleModeTwoSpatialLayersReordered) {
CheckReferencesVp9(8, 1, 7);
}
TEST_F(TestRtpFrameReferenceFinder, WrappingFlexReference) {
InsertVp9Flex(0, 0, false, 0, 0, 0, 0, false, {1});
ASSERT_EQ(1UL, frames_from_callback_.size());
CheckReferencesVp9(1, 0, 0);
}
} // namespace video_coding
} // namespace webrtc