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

Added sanity check to VCMDecodingState::UsingFlexibleMode to prevent OOB error.

Browse Source 
BUG=chromium:667504

Review-Url: https://codereview.webrtc.org/2534883003
Cr-Commit-Position: refs/heads/master@{#15298}
This commit is contained in:
philipel
2016-11-29 07:01:23 -08:00
committed by Commit bot
parent ad6f646a3f
commit ee414d90b0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/video_coding/decoding_state.cc
View File

@ -291,8 +291,15 @@ bool VCMDecodingState::UsingPictureId(const VCMFrameBuffer* frame) const {
}
bool VCMDecodingState::UsingFlexibleMode(const VCMFrameBuffer* frame) const {
return frame->CodecSpecific()->codecType == kVideoCodecVP9 &&
frame->CodecSpecific()->codecSpecific.VP9.flexible_mode;
bool is_flexible_mode =
frame->CodecSpecific()->codecType == kVideoCodecVP9 &&
frame->CodecSpecific()->codecSpecific.VP9.flexible_mode;
if (is_flexible_mode && frame->PictureId() == kNoPictureId) {
LOG(LS_WARNING) << "Frame is marked as using flexible mode but no"
<< "picture id is set.";
return false;
}
return is_flexible_mode;
}
// TODO(philipel): change how check work, this check practially