diff options
author | Bartosz Fabianowski <bartfab@chromium.org> | 2015-04-16 12:27:51 +0200 |
---|---|---|
committer | Bartosz Fabianowski <bartfab@chromium.org> | 2015-04-16 10:28:32 +0000 |
commit | 85a8238181175de195158bf1554f530cd0f6e3f1 (patch) | |
tree | 72b0b33ece151dc9cdb2e7af36e8d554ec64350e /content/renderer | |
parent | 919dce4400651813d5ff6e8a85b944a5987adcb7 (diff) | |
download | chromium_src-85a8238181175de195158bf1554f530cd0f6e3f1.zip chromium_src-85a8238181175de195158bf1554f530cd0f6e3f1.tar.gz chromium_src-85a8238181175de195158bf1554f530cd0f6e3f1.tar.bz2 |
Revert "Speculative revert by sheriff"
This reverts commit 919dce4400651813d5ff6e8a85b944a5987adcb7.
BUG=None
TBR=akuegel
Review URL: https://codereview.chromium.org/1094553002
Cr-Commit-Position: refs/heads/master@{#325412}
Diffstat (limited to 'content/renderer')
4 files changed, 22 insertions, 6 deletions
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 7779004..284123a 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -1272,6 +1272,12 @@ void WebMediaPlayerAndroid::SetCurrentFrameInternal( current_frame_ = video_frame; } +bool WebMediaPlayerAndroid::UpdateCurrentFrame(base::TimeTicks deadline_min, + base::TimeTicks deadline_max) { + NOTIMPLEMENTED(); + return false; +} + scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() { scoped_refptr<VideoFrame> video_frame; { @@ -1282,8 +1288,7 @@ scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() { return video_frame; } -void WebMediaPlayerAndroid::PutCurrentFrame( - const scoped_refptr<media::VideoFrame>& frame) { +void WebMediaPlayerAndroid::PutCurrentFrame() { } void WebMediaPlayerAndroid::ResetStreamTextureProxy() { diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index c1e30101..5d5f653 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -185,8 +185,10 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, // compositor thread. void SetVideoFrameProviderClient( cc::VideoFrameProvider::Client* client) override; + bool UpdateCurrentFrame(base::TimeTicks deadline_min, + base::TimeTicks deadline_max) override; scoped_refptr<media::VideoFrame> GetCurrentFrame() override; - void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override; + void PutCurrentFrame() override; // Media player callback handlers. void OnMediaMetadataChanged(const base::TimeDelta& duration, int width, diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc index f76d616..de6f33b 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc @@ -456,6 +456,14 @@ void WebMediaPlayerMS::SetVideoFrameProviderClient( video_frame_provider_client_ = client; } +bool WebMediaPlayerMS::UpdateCurrentFrame(base::TimeTicks deadline_min, + base::TimeTicks deadline_max) { + // TODO(dalecurtis): This should make use of the deadline interval to ensure + // the painted frame is correct for the given interval. + NOTREACHED(); + return false; +} + scoped_refptr<media::VideoFrame> WebMediaPlayerMS::GetCurrentFrame() { DVLOG(3) << "WebMediaPlayerMS::GetCurrentFrame"; base::AutoLock auto_lock(current_frame_lock_); @@ -467,8 +475,7 @@ scoped_refptr<media::VideoFrame> WebMediaPlayerMS::GetCurrentFrame() { return current_frame_; } -void WebMediaPlayerMS::PutCurrentFrame( - const scoped_refptr<media::VideoFrame>& frame) { +void WebMediaPlayerMS::PutCurrentFrame() { DVLOG(3) << "WebMediaPlayerMS::PutCurrentFrame"; DCHECK(pending_repaint_); pending_repaint_ = false; diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index da99ef1..7310fd6 100644 --- a/content/renderer/media/webmediaplayer_ms.h +++ b/content/renderer/media/webmediaplayer_ms.h @@ -134,8 +134,10 @@ class WebMediaPlayerMS // VideoFrameProvider implementation. void SetVideoFrameProviderClient( cc::VideoFrameProvider::Client* client) override; + bool UpdateCurrentFrame(base::TimeTicks deadline_min, + base::TimeTicks deadline_max) override; scoped_refptr<media::VideoFrame> GetCurrentFrame() override; - void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override; + void PutCurrentFrame() override; private: // The callback for VideoFrameProvider to signal a new frame is available. |