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

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

Issue 15499006: Enable seek in fullscreen mode for MSE impl on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add CancelPendingSeek() 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 | Annotate | Revision Log
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 #include "webkit/media/android/media_source_delegate.h" 5 #include "webkit/media/android/media_source_delegate.h"
6 6
7 #include "base/message_loop_proxy.h" 7 #include "base/message_loop_proxy.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "media/base/android/demuxer_stream_player_params.h" 9 #include "media/base/android/demuxer_stream_player_params.h"
10 #include "media/base/bind_to_loop.h" 10 #include "media/base/bind_to_loop.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void MediaSourceDelegate::Seek(base::TimeDelta time) { 201 void MediaSourceDelegate::Seek(base::TimeDelta time) {
202 seeking_ = true; 202 seeking_ = true;
203 DCHECK(chunk_demuxer_); 203 DCHECK(chunk_demuxer_);
204 if (!chunk_demuxer_) 204 if (!chunk_demuxer_)
205 return; 205 return;
206 chunk_demuxer_->StartWaitingForSeek(); 206 chunk_demuxer_->StartWaitingForSeek();
207 chunk_demuxer_->Seek(time, 207 chunk_demuxer_->Seek(time,
208 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerError)); 208 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerError));
209 } 209 }
210 210
211 void MediaSourceDelegate::CancelPendingSeek() {
212 if (chunk_demuxer_)
213 chunk_demuxer_->CancelPendingSeek();
214 }
215
211 void MediaSourceDelegate::SetTotalBytes(int64 total_bytes) { 216 void MediaSourceDelegate::SetTotalBytes(int64 total_bytes) {
212 NOTIMPLEMENTED(); 217 NOTIMPLEMENTED();
213 } 218 }
214 219
215 void MediaSourceDelegate::AddBufferedByteRange(int64 start, int64 end) { 220 void MediaSourceDelegate::AddBufferedByteRange(int64 start, int64 end) {
216 NOTIMPLEMENTED(); 221 NOTIMPLEMENTED();
217 } 222 }
218 223
219 void MediaSourceDelegate::AddBufferedTimeRange(base::TimeDelta start, 224 void MediaSourceDelegate::AddBufferedTimeRange(base::TimeDelta start,
220 base::TimeDelta end) { 225 base::TimeDelta end) {
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {} 464 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {}
460 465
461 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack( 466 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(
462 media::TextKind kind, 467 media::TextKind kind,
463 const std::string& label, 468 const std::string& label,
464 const std::string& language) { 469 const std::string& language) {
465 return scoped_ptr<media::TextTrack>(); 470 return scoped_ptr<media::TextTrack>();
466 } 471 }
467 472
468 } // namespace webkit_media 473 } // namespace webkit_media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698