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

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

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/base/filters.h ('k') | media/filters/ffmpeg_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 #include "media/base/filters.h" 5 #include "media/base/filters.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 callback.Run(PIPELINE_OK); 54 callback.Run(PIPELINE_OK);
55 } 55 }
56 56
57 void Filter::OnAudioRendererDisabled() { 57 void Filter::OnAudioRendererDisabled() {
58 } 58 }
59 59
60 VideoDecoder::VideoDecoder() {} 60 VideoDecoder::VideoDecoder() {}
61 61
62 VideoDecoder::~VideoDecoder() {} 62 VideoDecoder::~VideoDecoder() {}
63 63
64 // TODO(xhwang): Remove the following four functions when VideoDecoder is not a
65 // Filter any more. See bug: http://crbug.com/108340
64 void VideoDecoder::Play(const base::Closure& /* callback */) { 66 void VideoDecoder::Play(const base::Closure& /* callback */) {
65 LOG(FATAL) << "VideoDecoder::Play is not supposed to be called."; 67 LOG(FATAL) << "VideoDecoder::Play is not supposed to be called.";
66 } 68 }
67 69
68 void VideoDecoder::Pause(const base::Closure& /* callback */) { 70 void VideoDecoder::Pause(const base::Closure& /* callback */) {
69 LOG(FATAL) << "VideoDecoder::Pause is not supposed to be called."; 71 LOG(FATAL) << "VideoDecoder::Pause is not supposed to be called.";
70 } 72 }
71 73
72 void VideoDecoder::Seek(base::TimeDelta /* time */, 74 void VideoDecoder::Seek(base::TimeDelta /* time */,
73 const PipelineStatusCB& /* callback */) { 75 const PipelineStatusCB& /* callback */) {
74 LOG(FATAL) << "VideoDecoder::Seek is not supposed to be called."; 76 LOG(FATAL) << "VideoDecoder::Seek is not supposed to be called.";
75 } 77 }
76 78
79 FilterHost* VideoDecoder::host() {
80 LOG(FATAL) << "VideoDecoder::host is not supposed to be called.";
81 return NULL;
82 }
83
77 bool VideoDecoder::HasAlpha() const { 84 bool VideoDecoder::HasAlpha() const {
78 return false; 85 return false;
79 } 86 }
80 87
81 void VideoDecoder::PrepareForShutdownHack() {} 88 void VideoDecoder::PrepareForShutdownHack() {}
82 89
83 } // namespace media 90 } // namespace media
OLDNEW
« no previous file with comments | « media/base/filters.h ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698