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

Side by Side Diff: content/renderer/media/rtc_video_decoder.h

Issue 9718013: Merge FilterStatusCB into PipelineStatusCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep ResetAndRunCB in filters.h. Created 8 years, 9 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 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 15 matching lines...) Expand all
26 class CONTENT_EXPORT RTCVideoDecoder 26 class CONTENT_EXPORT RTCVideoDecoder
27 : public media::VideoDecoder, 27 : public media::VideoDecoder,
28 NON_EXPORTED_BASE(public cricket::VideoRenderer) { 28 NON_EXPORTED_BASE(public cricket::VideoRenderer) {
29 public: 29 public:
30 RTCVideoDecoder(MessageLoop* message_loop, const std::string& url); 30 RTCVideoDecoder(MessageLoop* message_loop, const std::string& url);
31 virtual ~RTCVideoDecoder(); 31 virtual ~RTCVideoDecoder();
32 32
33 // Filter implementation. 33 // Filter implementation.
34 virtual void Play(const base::Closure& callback) OVERRIDE; 34 virtual void Play(const base::Closure& callback) OVERRIDE;
35 virtual void Seek(base::TimeDelta time, 35 virtual void Seek(base::TimeDelta time,
36 const media::FilterStatusCB& cb) OVERRIDE; 36 const media::PipelineStatusCB& cb) OVERRIDE;
37 virtual void Pause(const base::Closure& callback) OVERRIDE; 37 virtual void Pause(const base::Closure& callback) OVERRIDE;
38 virtual void Flush(const base::Closure& callback) OVERRIDE; 38 virtual void Flush(const base::Closure& callback) OVERRIDE;
39 virtual void Stop(const base::Closure& callback) OVERRIDE; 39 virtual void Stop(const base::Closure& callback) OVERRIDE;
40 40
41 // Decoder implementation. 41 // Decoder implementation.
42 virtual void Initialize( 42 virtual void Initialize(
43 media::DemuxerStream* demuxer_stream, 43 media::DemuxerStream* demuxer_stream,
44 const media::PipelineStatusCB& status_cb, 44 const media::PipelineStatusCB& status_cb,
45 const media::StatisticsCB& statistics_cb) OVERRIDE; 45 const media::StatisticsCB& statistics_cb) OVERRIDE;
46 virtual void Read(const ReadCB& callback) OVERRIDE; 46 virtual void Read(const ReadCB& callback) OVERRIDE;
(...skipping 27 matching lines...) Expand all
74 base::TimeDelta last_frame_timestamp_; 74 base::TimeDelta last_frame_timestamp_;
75 base::TimeDelta start_time_; 75 base::TimeDelta start_time_;
76 76
77 // Used for accessing |read_cb_| from another thread. 77 // Used for accessing |read_cb_| from another thread.
78 base::Lock lock_; 78 base::Lock lock_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder); 80 DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
81 }; 81 };
82 82
83 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 83 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698