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

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

Issue 10835044: Cancel pending seek in ChunkDemuxer when a new seek occurs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase ToT + fix threading issue 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void PipelineErrorCallback(media::PipelineStatus error); 86 void PipelineErrorCallback(media::PipelineStatus error);
87 87
88 // ChunkDemuxerClient implementation. 88 // ChunkDemuxerClient implementation.
89 virtual void DemuxerOpened(media::ChunkDemuxer* demuxer) OVERRIDE; 89 virtual void DemuxerOpened(media::ChunkDemuxer* demuxer) OVERRIDE;
90 virtual void DemuxerClosed() OVERRIDE; 90 virtual void DemuxerClosed() OVERRIDE;
91 virtual void DemuxerNeedKey(scoped_array<uint8> init_data, 91 virtual void DemuxerNeedKey(scoped_array<uint8> init_data,
92 int init_data_size) OVERRIDE; 92 int init_data_size) OVERRIDE;
93 93
94 // Methods for Demuxer communication. 94 // Methods for Demuxer communication.
95 void DemuxerStartWaitingForSeek(); 95 void DemuxerStartWaitingForSeek();
96 void DemuxerCancelPendingSeek();
96 media::ChunkDemuxer::Status DemuxerAddId(const std::string& id, 97 media::ChunkDemuxer::Status DemuxerAddId(const std::string& id,
97 const std::string& type, 98 const std::string& type,
98 std::vector<std::string>& codecs); 99 std::vector<std::string>& codecs);
99 void DemuxerRemoveId(const std::string& id); 100 void DemuxerRemoveId(const std::string& id);
100 media::Ranges<base::TimeDelta> DemuxerBufferedRange(const std::string& id); 101 media::Ranges<base::TimeDelta> DemuxerBufferedRange(const std::string& id);
101 bool DemuxerAppend(const std::string& id, const uint8* data, size_t length); 102 bool DemuxerAppend(const std::string& id, const uint8* data, size_t length);
102 void DemuxerAbort(const std::string& id); 103 void DemuxerAbort(const std::string& id);
103 void DemuxerEndOfStream(media::PipelineStatus status); 104 void DemuxerEndOfStream(media::PipelineStatus status);
104 void DemuxerShutdown(); 105 void DemuxerShutdown();
105 bool DemuxerSetTimestampOffset(const std::string& id, double offset); 106 bool DemuxerSetTimestampOffset(const std::string& id, double offset);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 int outstanding_repaints_; 184 int outstanding_repaints_;
184 185
185 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 186 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
186 187
187 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy); 188 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
188 }; 189 };
189 190
190 } // namespace webkit_media 191 } // namespace webkit_media
191 192
192 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 193 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698