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

Side by Side Diff: webkit/media/webmediaplayer_ms.h

Issue 11270012: Adding audio support to the new webmediaplyer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed some comments in rtc_audio_renderer.h Created 8 years, 1 month 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ 5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ 6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
12 #include "media/filters/skcanvas_video_renderer.h" 12 #include "media/filters/skcanvas_video_renderer.h"
13 #include "skia/ext/platform_canvas.h" 13 #include "skia/ext/platform_canvas.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
15 15
16 namespace WebKit { 16 namespace WebKit {
17 class WebFrame; 17 class WebFrame;
18 class WebMediaPlayerClient; 18 class WebMediaPlayerClient;
19 } 19 }
20 20
21 namespace media { 21 namespace media {
22 class MediaLog; 22 class MediaLog;
23 class RtcAudioRenderer;
23 } 24 }
24 25
25 namespace webkit_media { 26 namespace webkit_media {
26 27
27 class MediaStreamClient; 28 class MediaStreamClient;
28 class VideoFrameProvider; 29 class VideoFrameProvider;
29 class WebMediaPlayerDelegate; 30 class WebMediaPlayerDelegate;
30 31
31 // WebMediaPlayerMS delegates calls from WebCore::MediaPlayerPrivate to 32 // WebMediaPlayerMS delegates calls from WebCore::MediaPlayerPrivate to
32 // Chrome's media player when "src" is from media stream. 33 // Chrome's media player when "src" is from media stream.
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 bool paused_; 154 bool paused_;
154 scoped_refptr<media::VideoFrame> current_frame_; 155 scoped_refptr<media::VideoFrame> current_frame_;
155 bool pending_repaint_; 156 bool pending_repaint_;
156 bool received_first_frame_; 157 bool received_first_frame_;
157 bool sequence_started_; 158 bool sequence_started_;
158 base::TimeDelta start_time_; 159 base::TimeDelta start_time_;
159 unsigned total_frame_count_; 160 unsigned total_frame_count_;
160 unsigned dropped_frame_count_; 161 unsigned dropped_frame_count_;
161 media::SkCanvasVideoRenderer video_renderer_; 162 media::SkCanvasVideoRenderer video_renderer_;
162 163
164 scoped_refptr<media::RtcAudioRenderer> audio_renderer_;
165
163 scoped_refptr<media::MediaLog> media_log_; 166 scoped_refptr<media::MediaLog> media_log_;
164 167
165 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 168 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
166 }; 169 };
167 170
168 } // namespace webkit_media 171 } // namespace webkit_media
169 172
170 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ 173 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698