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

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

Issue 10823300: Make ChunkDemuxer::SetTimestampOffset take a TimeDelta instead of double (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better solution 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
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 void DemuxerCancelPendingSeek(); 91 void DemuxerCancelPendingSeek();
92 media::ChunkDemuxer::Status DemuxerAddId(const std::string& id, 92 media::ChunkDemuxer::Status DemuxerAddId(const std::string& id,
93 const std::string& type, 93 const std::string& type,
94 std::vector<std::string>& codecs); 94 std::vector<std::string>& codecs);
95 void DemuxerRemoveId(const std::string& id); 95 void DemuxerRemoveId(const std::string& id);
96 media::Ranges<base::TimeDelta> DemuxerBufferedRange(const std::string& id); 96 media::Ranges<base::TimeDelta> DemuxerBufferedRange(const std::string& id);
97 bool DemuxerAppend(const std::string& id, const uint8* data, size_t length); 97 bool DemuxerAppend(const std::string& id, const uint8* data, size_t length);
98 void DemuxerAbort(const std::string& id); 98 void DemuxerAbort(const std::string& id);
99 void DemuxerEndOfStream(media::PipelineStatus status); 99 void DemuxerEndOfStream(media::PipelineStatus status);
100 void DemuxerShutdown(); 100 void DemuxerShutdown();
101 bool DemuxerSetTimestampOffset(const std::string& id, double offset); 101 bool DemuxerSetTimestampOffset(const std::string& id, base::TimeDelta offset);
102 102
103 // DecryptorClient implementation. 103 // DecryptorClient implementation.
104 virtual void KeyAdded(const std::string& key_system, 104 virtual void KeyAdded(const std::string& key_system,
105 const std::string& session_id) OVERRIDE; 105 const std::string& session_id) OVERRIDE;
106 virtual void KeyError(const std::string& key_system, 106 virtual void KeyError(const std::string& key_system,
107 const std::string& session_id, 107 const std::string& session_id,
108 media::Decryptor::KeyError error_code, 108 media::Decryptor::KeyError error_code,
109 int system_code) OVERRIDE; 109 int system_code) OVERRIDE;
110 virtual void KeyMessage(const std::string& key_system, 110 virtual void KeyMessage(const std::string& key_system,
111 const std::string& session_id, 111 const std::string& session_id,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 int outstanding_repaints_; 178 int outstanding_repaints_;
179 179
180 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 180 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
181 181
182 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy); 182 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
183 }; 183 };
184 184
185 } // namespace webkit_media 185 } // namespace webkit_media
186 186
187 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 187 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698