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

Side by Side Diff: cc/resources/video_resource_updater.cc

Issue 809883004: Revert hardware decoder changes causing ChromeOS HW test crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/common/gpu/media/generic_v4l2_video_device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/video_resource_updater.h" 5 #include "cc/resources/video_resource_updater.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 case media::VideoFrame::YV12: 142 case media::VideoFrame::YV12:
143 case media::VideoFrame::I420: 143 case media::VideoFrame::I420:
144 case media::VideoFrame::YV12A: 144 case media::VideoFrame::YV12A:
145 case media::VideoFrame::YV16: 145 case media::VideoFrame::YV16:
146 case media::VideoFrame::YV12J: 146 case media::VideoFrame::YV12J:
147 case media::VideoFrame::YV24: 147 case media::VideoFrame::YV24:
148 case media::VideoFrame::NATIVE_TEXTURE: 148 case media::VideoFrame::NATIVE_TEXTURE:
149 #if defined(VIDEO_HOLE) 149 #if defined(VIDEO_HOLE)
150 case media::VideoFrame::HOLE: 150 case media::VideoFrame::HOLE:
151 #endif // defined(VIDEO_HOLE) 151 #endif // defined(VIDEO_HOLE)
152 case media::VideoFrame::ARGB:
153 return true; 152 return true;
154 153
155 // Unacceptable inputs. ¯\(°_o)/¯ 154 // Unacceptable inputs. ¯\(°_o)/¯
156 case media::VideoFrame::UNKNOWN: 155 case media::VideoFrame::UNKNOWN:
157 case media::VideoFrame::NV12: 156 case media::VideoFrame::NV12:
158 break; 157 break;
159 } 158 }
160 return false; 159 return false;
161 } 160 }
162 161
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 resource_it->ref_count = 0; 420 resource_it->ref_count = 0;
422 updater->DeleteResource(resource_it); 421 updater->DeleteResource(resource_it);
423 return; 422 return;
424 } 423 }
425 424
426 --resource_it->ref_count; 425 --resource_it->ref_count;
427 DCHECK_GE(resource_it->ref_count, 0); 426 DCHECK_GE(resource_it->ref_count, 0);
428 } 427 }
429 428
430 } // namespace cc 429 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/media/generic_v4l2_video_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698