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

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

Issue 10796074: Move VideoRenderer out of Filter heirarchy. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: GetMediaTime Created 8 years, 5 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
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 #include "media/filters/gpu_video_decoder.h" 5 #include "media/filters/gpu_video_decoder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "media/base/decoder_buffer.h" 11 #include "media/base/decoder_buffer.h"
12 #include "media/base/demuxer_stream.h" 12 #include "media/base/demuxer_stream.h"
13 #include "media/base/filter_host.h"
14 #include "media/base/pipeline.h" 13 #include "media/base/pipeline.h"
15 #include "media/base/pipeline_status.h" 14 #include "media/base/pipeline_status.h"
16 #include "media/base/video_decoder_config.h" 15 #include "media/base/video_decoder_config.h"
17 #include "media/ffmpeg/ffmpeg_common.h" 16 #include "media/ffmpeg/ffmpeg_common.h"
18 17
19 namespace media { 18 namespace media {
20 19
21 GpuVideoDecoder::Factories::~Factories() {} 20 GpuVideoDecoder::Factories::~Factories() {}
22 21
23 // Size of shared-memory segments we allocate. Since we reuse them we let them 22 // Size of shared-memory segments we allocate. Since we reuse them we let them
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 557
559 error_occured_ = true; 558 error_occured_ = true;
560 559
561 if (!pending_read_cb_.is_null()) { 560 if (!pending_read_cb_.is_null()) {
562 base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL); 561 base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL);
563 return; 562 return;
564 } 563 }
565 } 564 }
566 565
567 } // namespace media 566 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/file_data_source_unittest.cc ('k') | media/filters/h264_to_annex_b_bitstream_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698