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

Side by Side Diff: media/blink/webmediaplayer_impl.h

Issue 787343003: Remove the index of in-band tracks on the Chromium side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « media/blink/webinbandtexttrack_impl.cc ('k') | media/blink/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 MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 // Video rendering members. 304 // Video rendering members.
305 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 305 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
306 VideoFrameCompositor* compositor_; // Deleted on |compositor_task_runner_|. 306 VideoFrameCompositor* compositor_; // Deleted on |compositor_task_runner_|.
307 SkCanvasVideoRenderer skcanvas_video_renderer_; 307 SkCanvasVideoRenderer skcanvas_video_renderer_;
308 308
309 // The compositor layer for displaying the video content when using composited 309 // The compositor layer for displaying the video content when using composited
310 // playback. 310 // playback.
311 scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_; 311 scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_;
312 312
313 // Text track objects get a unique index value when they're created.
314 int text_track_index_;
315
316 EncryptedMediaPlayerSupport encrypted_media_support_; 313 EncryptedMediaPlayerSupport encrypted_media_support_;
317 314
318 const AudioHardwareConfig& audio_hardware_config_; 315 const AudioHardwareConfig& audio_hardware_config_;
319 316
320 scoped_ptr<Renderer> renderer_; 317 scoped_ptr<Renderer> renderer_;
321 318
322 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 319 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
323 }; 320 };
324 321
325 } // namespace media 322 } // namespace media
326 323
327 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 324 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/webinbandtexttrack_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698