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

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

Issue 9155003: Fix media timeline so that thumb never exceeds buffered data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/composite_filter.h" 5 #include "media/base/composite_filter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.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 11
12 namespace media { 12 namespace media {
13 13
14 class CompositeFilter::FilterHostImpl : public FilterHost { 14 class CompositeFilter::FilterHostImpl : public FilterHost {
15 public: 15 public:
16 FilterHostImpl(CompositeFilter* parent, FilterHost* host); 16 FilterHostImpl(CompositeFilter* parent, FilterHost* host);
17 17
18 FilterHost* host(); 18 FilterHost* host();
19 19
20 // media::FilterHost methods. 20 // media::FilterHost methods.
21 virtual void SetError(PipelineStatus error) OVERRIDE; 21 virtual void SetError(PipelineStatus error) OVERRIDE;
22 virtual base::TimeDelta GetTime() const OVERRIDE; 22 virtual base::TimeDelta GetTime() const OVERRIDE;
23 virtual base::TimeDelta GetDuration() const OVERRIDE; 23 virtual base::TimeDelta GetDuration() const OVERRIDE;
24 virtual void SetTime(base::TimeDelta time) OVERRIDE;
25 virtual void SetNaturalVideoSize(const gfx::Size& size) OVERRIDE; 24 virtual void SetNaturalVideoSize(const gfx::Size& size) OVERRIDE;
26 virtual void NotifyEnded() OVERRIDE; 25 virtual void NotifyEnded() OVERRIDE;
27 virtual void DisableAudioRenderer() OVERRIDE; 26 virtual void DisableAudioRenderer() OVERRIDE;
28 27
29 private: 28 private:
30 CompositeFilter* parent_; 29 CompositeFilter* parent_;
31 FilterHost* host_; 30 FilterHost* host_;
32 31
33 DISALLOW_COPY_AND_ASSIGN(FilterHostImpl); 32 DISALLOW_COPY_AND_ASSIGN(FilterHostImpl);
34 }; 33 };
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 } 488 }
490 489
491 base::TimeDelta CompositeFilter::FilterHostImpl::GetTime() const { 490 base::TimeDelta CompositeFilter::FilterHostImpl::GetTime() const {
492 return host_->GetTime(); 491 return host_->GetTime();
493 } 492 }
494 493
495 base::TimeDelta CompositeFilter::FilterHostImpl::GetDuration() const { 494 base::TimeDelta CompositeFilter::FilterHostImpl::GetDuration() const {
496 return host_->GetDuration(); 495 return host_->GetDuration();
497 } 496 }
498 497
499 void CompositeFilter::FilterHostImpl::SetTime(base::TimeDelta time) {
500 host_->SetTime(time);
501 }
502
503 void CompositeFilter::FilterHostImpl::SetNaturalVideoSize( 498 void CompositeFilter::FilterHostImpl::SetNaturalVideoSize(
504 const gfx::Size& size) { 499 const gfx::Size& size) {
505 host_->SetNaturalVideoSize(size); 500 host_->SetNaturalVideoSize(size);
506 } 501 }
507 502
508 void CompositeFilter::FilterHostImpl::NotifyEnded() { 503 void CompositeFilter::FilterHostImpl::NotifyEnded() {
509 host_->NotifyEnded(); 504 host_->NotifyEnded();
510 } 505 }
511 506
512 void CompositeFilter::FilterHostImpl::DisableAudioRenderer() { 507 void CompositeFilter::FilterHostImpl::DisableAudioRenderer() {
513 host_->DisableAudioRenderer(); 508 host_->DisableAudioRenderer();
514 } 509 }
515 510
516 } // namespace media 511 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698