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

Side by Side Diff: webkit/media/android/media_source_delegate.h

Issue 13419002: Media Source dispatches inband text tracks (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 7 years, 7 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 5 #ifndef WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
6 #define WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 6 #define WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/time.h" 12 #include "base/time.h"
13 #include "media/base/decryptor.h" 13 #include "media/base/decryptor.h"
14 #include "media/base/demuxer.h" 14 #include "media/base/demuxer.h"
15 #include "media/base/pipeline_status.h" 15 #include "media/base/pipeline_status.h"
16 #include "media/base/ranges.h" 16 #include "media/base/ranges.h"
17 #include "media/base/text_track.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
18 19
19 namespace media { 20 namespace media {
20 class ChunkDemuxer; 21 class ChunkDemuxer;
21 class DecoderBuffer; 22 class DecoderBuffer;
22 class DemuxerStream; 23 class DemuxerStream;
23 class MediaLog; 24 class MediaLog;
24 struct MediaPlayerHostMsg_ReadFromDemuxerAck_Params; 25 struct MediaPlayerHostMsg_ReadFromDemuxerAck_Params;
25 } 26 }
26 27
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 void OnKeyMessage(const std::string& key_system, 99 void OnKeyMessage(const std::string& key_system,
99 const std::string& session_id, 100 const std::string& session_id,
100 const std::string& message, 101 const std::string& message,
101 const std::string& default_url); 102 const std::string& default_url);
102 void OnNeedKey(const std::string& key_system, 103 void OnNeedKey(const std::string& key_system,
103 const std::string& type, 104 const std::string& type,
104 const std::string& session_id, 105 const std::string& session_id,
105 scoped_ptr<uint8[]> init_data, 106 scoped_ptr<uint8[]> init_data,
106 int init_data_size); 107 int init_data_size);
107 void OnDecryptorReady(media::Decryptor*); 108 void OnDecryptorReady(media::Decryptor*);
109 scoped_ptr<media::TextTrack> OnAddTextTrack(media::TextKind kind,
110 const std::string& label,
111 const std::string& language);
108 112
109 // Reads an access unit from the demuxer stream |stream| and stores it in 113 // Reads an access unit from the demuxer stream |stream| and stores it in
110 // the |index|th access unit in |params|. 114 // the |index|th access unit in |params|.
111 void ReadFromDemuxerStream( 115 void ReadFromDemuxerStream(
112 media::DemuxerStream* stream, 116 media::DemuxerStream* stream,
113 media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params* params, 117 media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params* params,
114 size_t index); 118 size_t index);
115 void OnBufferReady( 119 void OnBufferReady(
116 media::DemuxerStream* stream, 120 media::DemuxerStream* stream,
117 media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params* params, 121 media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params* params,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> video_params_; 157 scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> video_params_;
154 158
155 bool seeking_; 159 bool seeking_;
156 160
157 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate); 161 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
158 }; 162 };
159 163
160 } // namespace webkit_media 164 } // namespace webkit_media
161 #endif // WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 165 #endif // WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
162 166
OLDNEW
« no previous file with comments | « media/webm/webm_webvtt_parser_unittest.cc ('k') | webkit/media/android/media_source_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698