Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Unified Diff: media/gpu/vt_video_decode_accelerator_mac.cc

Issue 2244853002: VTVDA: Verify |picture_id| in ResusePictureBuffer(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reduce ambiguity. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/vt_video_decode_accelerator_mac.cc
diff --git a/media/gpu/vt_video_decode_accelerator_mac.cc b/media/gpu/vt_video_decode_accelerator_mac.cc
index 2b37130506e297534a4382db4e07a01eedb4ae7c..e8bcaf7c77a88fbca0cd8e0f0cd442333c7f7e45 100644
--- a/media/gpu/vt_video_decode_accelerator_mac.cc
+++ b/media/gpu/vt_video_decode_accelerator_mac.cc
@@ -866,13 +866,16 @@ void VTVideoDecodeAccelerator::AssignPictureBuffers(
void VTVideoDecodeAccelerator::ReusePictureBuffer(int32_t picture_id) {
DCHECK(gpu_thread_checker_.CalledOnValidThread());
- DCHECK(picture_info_map_.count(picture_id));
- PictureInfo* picture_info = picture_info_map_.find(picture_id)->second.get();
- picture_info->cv_image.reset();
- picture_info->gl_image->Destroy(false);
- picture_info->gl_image = nullptr;
- if (assigned_picture_ids_.count(picture_id) != 0) {
+ auto it = picture_info_map_.find(picture_id);
+ if (it != picture_info_map_.end()) {
+ PictureInfo* picture_info = it->second.get();
+ picture_info->cv_image.reset();
+ picture_info->gl_image->Destroy(false);
+ picture_info->gl_image = nullptr;
+ }
+
+ if (assigned_picture_ids_.count(picture_id)) {
available_picture_ids_.push_back(picture_id);
ProcessWorkQueues();
} else {
@@ -1024,8 +1027,9 @@ bool VTVideoDecodeAccelerator::SendFrame(const Frame& frame) {
return false;
int32_t picture_id = available_picture_ids_.back();
- DCHECK(picture_info_map_.count(picture_id));
- PictureInfo* picture_info = picture_info_map_.find(picture_id)->second.get();
+ auto it = picture_info_map_.find(picture_id);
+ DCHECK(it != picture_info_map_.end());
+ PictureInfo* picture_info = it->second.get();
DCHECK(!picture_info->cv_image);
DCHECK(!picture_info->gl_image);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698