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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix compile errors 11/21 #6 Created 7 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 | « content/renderer/media/texttrack_impl.cc ('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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 namespace blink { 48 namespace blink {
49 class WebFrame; 49 class WebFrame;
50 } 50 }
51 51
52 namespace base { 52 namespace base {
53 class MessageLoopProxy; 53 class MessageLoopProxy;
54 } 54 }
55 55
56 namespace media { 56 namespace media {
57 class ChunkDemuxer; 57 class ChunkDemuxer;
58 class FFmpegDemuxer;
59 class GpuVideoAcceleratorFactories; 58 class GpuVideoAcceleratorFactories;
60 class MediaLog; 59 class MediaLog;
61 } 60 }
62 61
63 namespace webkit { 62 namespace webkit {
64 class WebLayerImpl; 63 class WebLayerImpl;
65 } 64 }
66 65
67 namespace content { 66 namespace content {
68 class BufferedDataSource; 67 class BufferedDataSource;
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 void OnDemuxerOpened(); 188 void OnDemuxerOpened();
190 void OnKeyAdded(const std::string& session_id); 189 void OnKeyAdded(const std::string& session_id);
191 void OnKeyError(const std::string& session_id, 190 void OnKeyError(const std::string& session_id,
192 media::MediaKeys::KeyError error_code, 191 media::MediaKeys::KeyError error_code,
193 int system_code); 192 int system_code);
194 void OnKeyMessage(const std::string& session_id, 193 void OnKeyMessage(const std::string& session_id,
195 const std::vector<uint8>& message, 194 const std::vector<uint8>& message,
196 const std::string& default_url); 195 const std::string& default_url);
197 void OnNeedKey(const std::string& type, 196 void OnNeedKey(const std::string& type,
198 const std::vector<uint8>& init_data); 197 const std::vector<uint8>& init_data);
199 scoped_ptr<media::TextTrack> OnTextTrack(media::TextKind kind, 198 void OnAddTextTrack(const media::TextTrackConfig& config,
200 const std::string& label, 199 const media::AddTextTrackDoneCB& done_cb);
201 const std::string& language);
202 void SetOpaque(bool); 200 void SetOpaque(bool);
203 201
204 private: 202 private:
205 // Called after |defer_load_cb_| has decided to allow the load. If 203 // Called after |defer_load_cb_| has decided to allow the load. If
206 // |defer_load_cb_| is null this is called immediately. 204 // |defer_load_cb_| is null this is called immediately.
207 void DoLoad(LoadType load_type, 205 void DoLoad(LoadType load_type,
208 const blink::WebURL& url, 206 const blink::WebURL& url,
209 CORSMode cors_mode); 207 CORSMode cors_mode);
210 208
211 // Called after asynchronous initialization of a data source completed. 209 // Called after asynchronous initialization of a data source completed.
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 372
375 // Text track objects get a unique index value when they're created. 373 // Text track objects get a unique index value when they're created.
376 int text_track_index_; 374 int text_track_index_;
377 375
378 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 376 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
379 }; 377 };
380 378
381 } // namespace content 379 } // namespace content
382 380
383 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 381 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/texttrack_impl.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698