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

Side by Side Diff: webkit/media/webmediaplayer_proxy.h

Issue 10803019: Chrome-side implementation of media source timestamp offset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase ToT Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/media/webmediaplayer_proxy.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEBMEDIAPLAYER_PROXY_H_ 5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 void DemuxerStartWaitingForSeek(); 98 void DemuxerStartWaitingForSeek();
99 media::ChunkDemuxer::Status DemuxerAddId(const std::string& id, 99 media::ChunkDemuxer::Status DemuxerAddId(const std::string& id,
100 const std::string& type, 100 const std::string& type,
101 std::vector<std::string>& codecs); 101 std::vector<std::string>& codecs);
102 void DemuxerRemoveId(const std::string& id); 102 void DemuxerRemoveId(const std::string& id);
103 media::Ranges<base::TimeDelta> DemuxerBufferedRange(const std::string& id); 103 media::Ranges<base::TimeDelta> DemuxerBufferedRange(const std::string& id);
104 bool DemuxerAppend(const std::string& id, const uint8* data, size_t length); 104 bool DemuxerAppend(const std::string& id, const uint8* data, size_t length);
105 void DemuxerAbort(const std::string& id); 105 void DemuxerAbort(const std::string& id);
106 void DemuxerEndOfStream(media::PipelineStatus status); 106 void DemuxerEndOfStream(media::PipelineStatus status);
107 void DemuxerShutdown(); 107 void DemuxerShutdown();
108 bool DemuxerSetTimestampOffset(const std::string& id, double offset);
108 109
109 // DecryptorClient implementation. 110 // DecryptorClient implementation.
110 virtual void KeyAdded(const std::string& key_system, 111 virtual void KeyAdded(const std::string& key_system,
111 const std::string& session_id) OVERRIDE; 112 const std::string& session_id) OVERRIDE;
112 virtual void KeyError(const std::string& key_system, 113 virtual void KeyError(const std::string& key_system,
113 const std::string& session_id, 114 const std::string& session_id,
114 media::Decryptor::KeyError error_code, 115 media::Decryptor::KeyError error_code,
115 int system_code) OVERRIDE; 116 int system_code) OVERRIDE;
116 virtual void KeyMessage(const std::string& key_system, 117 virtual void KeyMessage(const std::string& key_system,
117 const std::string& session_id, 118 const std::string& session_id,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 int outstanding_repaints_; 186 int outstanding_repaints_;
186 187
187 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 188 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
188 189
189 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy); 190 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
190 }; 191 };
191 192
192 } // namespace webkit_media 193 } // namespace webkit_media
193 194
194 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 195 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/media/webmediaplayer_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698