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

Side by Side Diff: content/renderer/media/texttrack_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
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_TEXTTRACK_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "media/base/text_track.h" 12 #include "media/base/text_track.h"
13 13
14 namespace base {
15 class MessageLoopProxy;
16 }
17
14 namespace blink { 18 namespace blink {
19 class WebInbandTextTrackClient;
15 class WebMediaPlayerClient; 20 class WebMediaPlayerClient;
16 } 21 }
17 22
18 namespace content { 23 namespace content {
19 24
20 class WebInbandTextTrackImpl; 25 class WebInbandTextTrackImpl;
21 26
22 class TextTrackImpl : public media::TextTrack { 27 class TextTrackImpl : public media::TextTrack {
23 public: 28 public:
24 // Constructor assumes ownership of the |text_track| object. 29 // Constructor assumes ownership of the |text_track| object.
25 TextTrackImpl(blink::WebMediaPlayerClient* client, 30 TextTrackImpl(const scoped_refptr<base::MessageLoopProxy>& message_loop,
26 WebInbandTextTrackImpl* text_track); 31 blink::WebMediaPlayerClient* client,
32 scoped_ptr<WebInbandTextTrackImpl> text_track);
27 33
28 virtual ~TextTrackImpl(); 34 virtual ~TextTrackImpl();
29 35
30 virtual void addWebVTTCue(const base::TimeDelta& start, 36 virtual void addWebVTTCue(const base::TimeDelta& start,
31 const base::TimeDelta& end, 37 const base::TimeDelta& end,
32 const std::string& id, 38 const std::string& id,
33 const std::string& content, 39 const std::string& content,
34 const std::string& settings) OVERRIDE; 40 const std::string& settings) OVERRIDE;
35 41
36 private: 42 private:
43 static void OnAddCue(WebInbandTextTrackImpl* text_track,
44 const base::TimeDelta& start,
45 const base::TimeDelta& end,
46 const std::string& id,
47 const std::string& content,
48 const std::string& settings);
49
50 static void OnRemoveTrack(blink::WebMediaPlayerClient* client,
51 scoped_ptr<WebInbandTextTrackImpl> text_track);
52
53 scoped_refptr<base::MessageLoopProxy> message_loop_;
37 blink::WebMediaPlayerClient* client_; 54 blink::WebMediaPlayerClient* client_;
38 scoped_ptr<WebInbandTextTrackImpl> text_track_; 55 scoped_ptr<WebInbandTextTrackImpl> text_track_;
39 DISALLOW_COPY_AND_ASSIGN(TextTrackImpl); 56 DISALLOW_COPY_AND_ASSIGN(TextTrackImpl);
40 }; 57 };
41 58
42 } // namespace content 59 } // namespace content
43 60
44 #endif // CONTENT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_ 61 #endif // CONTENT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_
45 62
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | content/renderer/media/texttrack_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698