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

Side by Side Diff: media/filters/gpu_video_decoder.h

Issue 10248002: Report VideoDecoder status through ReadCB instead of through FilterHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename VideoDecoder::Status to VideoDecoder::DecoderStatus since Status has been polluted by Xlib.h. Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/gpu_video_decoder.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // picture_buffer_id and the frame wrapping the corresponding Picture, for 201 // picture_buffer_id and the frame wrapping the corresponding Picture, for
202 // frames that have been decoded but haven't been requested by a Read() yet. 202 // frames that have been decoded but haven't been requested by a Read() yet.
203 std::list<scoped_refptr<VideoFrame> > ready_video_frames_; 203 std::list<scoped_refptr<VideoFrame> > ready_video_frames_;
204 int64 next_picture_buffer_id_; 204 int64 next_picture_buffer_id_;
205 int64 next_bitstream_buffer_id_; 205 int64 next_bitstream_buffer_id_;
206 206
207 // Indicates PrepareForShutdownHack()'s been called. Makes further calls to 207 // Indicates PrepareForShutdownHack()'s been called. Makes further calls to
208 // this class not require the render thread's loop to be processing. 208 // this class not require the render thread's loop to be processing.
209 bool shutting_down_; 209 bool shutting_down_;
210 210
211 // Indicates decoding error occurred.
212 bool error_occured_;
213
211 DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder); 214 DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
212 }; 215 };
213 216
214 } // namespace media 217 } // namespace media
215 218
216 #endif // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ 219 #endif // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/gpu_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698