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

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

Issue 512413002: Move Preload enum to BufferedDataSource. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « content/renderer/media/preload.h ('k') | content/renderer/media/webmediaplayer_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 // compositor can return the frame. 221 // compositor can return the frame.
222 scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor(); 222 scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor();
223 223
224 blink::WebLocalFrame* frame_; 224 blink::WebLocalFrame* frame_;
225 225
226 // TODO(hclam): get rid of these members and read from the pipeline directly. 226 // TODO(hclam): get rid of these members and read from the pipeline directly.
227 blink::WebMediaPlayer::NetworkState network_state_; 227 blink::WebMediaPlayer::NetworkState network_state_;
228 blink::WebMediaPlayer::ReadyState ready_state_; 228 blink::WebMediaPlayer::ReadyState ready_state_;
229 229
230 // Preload state for when |data_source_| is created after setPreload(). 230 // Preload state for when |data_source_| is created after setPreload().
231 content::Preload preload_; 231 BufferedDataSource::Preload preload_;
232 232
233 // Task runner for posting tasks on Chrome's main thread. Also used 233 // Task runner for posting tasks on Chrome's main thread. Also used
234 // for DCHECKs so methods calls won't execute in the wrong thread. 234 // for DCHECKs so methods calls won't execute in the wrong thread.
235 const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; 235 const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
236 236
237 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; 237 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
238 scoped_refptr<media::MediaLog> media_log_; 238 scoped_refptr<media::MediaLog> media_log_;
239 media::Pipeline pipeline_; 239 media::Pipeline pipeline_;
240 240
241 // The LoadType passed in the |load_type| parameter of the load() call. 241 // The LoadType passed in the |load_type| parameter of the load() call.
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 int text_track_index_; 312 int text_track_index_;
313 313
314 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_; 314 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_;
315 315
316 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 316 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
317 }; 317 };
318 318
319 } // namespace content 319 } // namespace content
320 320
321 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 321 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/preload.h ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698