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

Side by Side Diff: webkit/media/webmediaplayer_impl.cc

Issue 10823260: Re-add sourceSetTimestampOffset to webmediaplayer_impl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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.h ('k') | no next file » | 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 #include "webkit/media/webmediaplayer_impl.h" 5 #include "webkit/media/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 NOTIMPLEMENTED(); 675 NOTIMPLEMENTED();
676 } 676 }
677 677
678 float old_duration = duration(); 678 float old_duration = duration();
679 proxy_->DemuxerEndOfStream(pipeline_status); 679 proxy_->DemuxerEndOfStream(pipeline_status);
680 680
681 if (old_duration != duration()) 681 if (old_duration != duration())
682 GetClient()->durationChanged(); 682 GetClient()->durationChanged();
683 } 683 }
684 684
685 bool WebMediaPlayerImpl::sourceSetTimestampOffset(const WebKit::WebString& id,
686 double offset) {
687 return proxy_->DemuxerSetTimestampOffset(id.utf8().data(), offset);
688 }
689
685 WebKit::WebMediaPlayer::MediaKeyException 690 WebKit::WebMediaPlayer::MediaKeyException
686 WebMediaPlayerImpl::generateKeyRequest(const WebString& key_system, 691 WebMediaPlayerImpl::generateKeyRequest(const WebString& key_system,
687 const unsigned char* init_data, 692 const unsigned char* init_data,
688 unsigned init_data_length) { 693 unsigned init_data_length) {
689 if (!IsSupportedKeySystem(key_system)) 694 if (!IsSupportedKeySystem(key_system))
690 return WebKit::WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported; 695 return WebKit::WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
691 696
692 // We do not support run-time switching between key systems for now. 697 // We do not support run-time switching between key systems for now.
693 if (current_key_system_.isEmpty()) 698 if (current_key_system_.isEmpty())
694 current_key_system_ = key_system; 699 current_key_system_ = key_system;
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 return audio_source_provider_; 1031 return audio_source_provider_;
1027 } 1032 }
1028 1033
1029 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { 1034 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
1030 DCHECK_EQ(main_loop_, MessageLoop::current()); 1035 DCHECK_EQ(main_loop_, MessageLoop::current());
1031 incremented_externally_allocated_memory_ = true; 1036 incremented_externally_allocated_memory_ = true;
1032 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); 1037 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
1033 } 1038 }
1034 1039
1035 } // namespace webkit_media 1040 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698