diff options
Diffstat (limited to 'content/renderer')
8 files changed, 0 insertions, 37 deletions
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc index bd786b0..107684b 100644 --- a/content/renderer/media/android/media_source_delegate.cc +++ b/content/renderer/media/android/media_source_delegate.cc @@ -184,12 +184,6 @@ void MediaSourceDelegate::InitializeDemuxer() { false); } -const blink::WebTimeRanges& MediaSourceDelegate::Buffered() { - buffered_web_time_ranges_ = - ConvertToWebTimeRanges(buffered_time_ranges_); - return buffered_web_time_ranges_; -} - blink::WebTimeRanges MediaSourceDelegate::Buffered() const { return ConvertToWebTimeRanges(buffered_time_ranges_); } diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h index 75de676..45854f2 100644 --- a/content/renderer/media/android/media_source_delegate.h +++ b/content/renderer/media/android/media_source_delegate.h @@ -67,7 +67,6 @@ class MediaSourceDelegate : public media::DemuxerHost { const UpdateNetworkStateCB& update_network_state_cb, const DurationChangeCB& duration_change_cb); - const blink::WebTimeRanges& Buffered(); blink::WebTimeRanges Buffered() const; size_t DecodedFrameCount() const; size_t DroppedFrameCount() const; @@ -206,8 +205,6 @@ class MediaSourceDelegate : public media::DemuxerHost { media::PipelineStatistics statistics_; media::Ranges<base::TimeDelta> buffered_time_ranges_; - // Keep a list of buffered time ranges. - blink::WebTimeRanges buffered_web_time_ranges_; MediaSourceOpenedCB media_source_opened_cb_; media::Demuxer::NeedKeyCB need_key_cb_; diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index fbee409..c1255a9 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -434,12 +434,6 @@ WebMediaPlayer::ReadyState WebMediaPlayerAndroid::readyState() const { return ready_state_; } -const WebTimeRanges& WebMediaPlayerAndroid::buffered() { - if (media_source_delegate_) - return media_source_delegate_->Buffered(); - return buffered_; -} - WebTimeRanges WebMediaPlayerAndroid::buffered() const { if (media_source_delegate_) return media_source_delegate_->Buffered(); diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 587e54c..db2dabe 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -98,7 +98,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, virtual bool supportsSave() const; virtual void setRate(double rate); virtual void setVolume(double volume); - virtual const blink::WebTimeRanges& buffered(); virtual blink::WebTimeRanges buffered() const; virtual double maxTimeSeekable() const; diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc index 12509dc..6aa009a 100644 --- a/content/renderer/media/webmediaplayer_impl.cc +++ b/content/renderer/media/webmediaplayer_impl.cc @@ -511,18 +511,6 @@ WebMediaPlayer::ReadyState WebMediaPlayerImpl::readyState() const { return ready_state_; } -const blink::WebTimeRanges& WebMediaPlayerImpl::buffered() { - DCHECK(main_loop_->BelongsToCurrentThread()); - media::Ranges<base::TimeDelta> buffered_time_ranges = - pipeline_.GetBufferedTimeRanges(); - buffered_data_source_host_.AddBufferedTimeRanges( - &buffered_time_ranges, pipeline_.GetMediaDuration()); - blink::WebTimeRanges buffered_web_time_ranges( - ConvertToWebTimeRanges(buffered_time_ranges)); - buffered_web_time_ranges_.swap(buffered_web_time_ranges); - return buffered_web_time_ranges_; -} - blink::WebTimeRanges WebMediaPlayerImpl::buffered() const { DCHECK(main_loop_->BelongsToCurrentThread()); media::Ranges<base::TimeDelta> buffered_time_ranges = diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h index a58613e..c27c039 100644 --- a/content/renderer/media/webmediaplayer_impl.h +++ b/content/renderer/media/webmediaplayer_impl.h @@ -87,7 +87,6 @@ class WebMediaPlayerImpl virtual void setRate(double rate); virtual void setVolume(double volume); virtual void setPreload(blink::WebMediaPlayer::Preload preload); - virtual const blink::WebTimeRanges& buffered(); virtual blink::WebTimeRanges buffered() const; virtual double maxTimeSeekable() const; @@ -327,8 +326,6 @@ class WebMediaPlayerImpl media::ChunkDemuxer* chunk_demuxer_; BufferedDataSourceHostImpl buffered_data_source_host_; - // TODO(sandersd): Remove this cache. http://crbug.com/360254 - blink::WebTimeRanges buffered_web_time_ranges_; // Temporary for EME v0.1. In the future the init data type should be passed // through GenerateKeyRequest() directly from WebKit. diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc index 64d2f3a..28a3bce 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc @@ -301,11 +301,6 @@ WebMediaPlayer::ReadyState WebMediaPlayerMS::readyState() const { return ready_state_; } -const blink::WebTimeRanges& WebMediaPlayerMS::buffered() { - DCHECK(thread_checker_.CalledOnValidThread()); - return buffered_; -} - blink::WebTimeRanges WebMediaPlayerMS::buffered() const { DCHECK(thread_checker_.CalledOnValidThread()); return buffered_; diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index 4c1cdf2..8665c5f 100644 --- a/content/renderer/media/webmediaplayer_ms.h +++ b/content/renderer/media/webmediaplayer_ms.h @@ -75,7 +75,6 @@ class WebMediaPlayerMS virtual void setRate(double rate); virtual void setVolume(double volume); virtual void setPreload(blink::WebMediaPlayer::Preload preload); - virtual const blink::WebTimeRanges& buffered(); virtual blink::WebTimeRanges buffered() const; virtual double maxTimeSeekable() const; |