| Index: webkit/glue/webmediaplayer_impl.cc
|
| diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
|
| index 4de52a34c45c797a1f6a1e17c8d4335903202969..025929fd0561b808a9bdfda2a4952c64a99cc317 100644
|
| --- a/webkit/glue/webmediaplayer_impl.cc
|
| +++ b/webkit/glue/webmediaplayer_impl.cc
|
| @@ -11,6 +11,7 @@
|
| #include "media/base/limits.h"
|
| #include "media/base/media_format.h"
|
| #include "media/base/media_switches.h"
|
| +#include "media/base/video_frame.h"
|
| #include "media/filters/ffmpeg_audio_decoder.h"
|
| #include "media/filters/ffmpeg_demuxer.h"
|
| #include "media/filters/ffmpeg_video_decoder.h"
|
| @@ -19,6 +20,8 @@
|
| #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
|
| +#include "third_party/WebKit/WebKit/chromium/public/WebVideoFrame.h"
|
| +#include "webkit/glue/webvideoframe_impl.h"
|
| #include "webkit/glue/media/video_renderer_impl.h"
|
| #include "webkit/glue/media/web_video_renderer.h"
|
|
|
| @@ -180,6 +183,18 @@ void WebMediaPlayerImpl::Proxy::NetworkEventTask() {
|
| }
|
| }
|
|
|
| +void WebMediaPlayerImpl::Proxy::GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out) {
|
| + if (video_renderer_) {
|
| + video_renderer_->GetCurrentFrame(frame_out);
|
| + }
|
| +}
|
| +
|
| +void WebMediaPlayerImpl::Proxy::PutCurrentFrame(scoped_refptr<media::VideoFrame> frame) {
|
| + if (video_renderer_) {
|
| + video_renderer_->PutCurrentFrame(frame);
|
| + }
|
| +}
|
| +
|
| /////////////////////////////////////////////////////////////////////////////
|
| // WebMediaPlayerImpl implementation
|
|
|
| @@ -719,4 +734,18 @@ WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
|
| return client_;
|
| }
|
|
|
| +void WebMediaPlayerImpl::getCurrentFrame(WebKit::WebVideoFrame** output) {
|
| + scoped_refptr<media::VideoFrame> video_frame;
|
| + proxy_->GetCurrentFrame(&video_frame);
|
| + if (video_frame.get())
|
| + *output = new WebVideoFrameImpl(video_frame.get());
|
| + else
|
| + *output = 0;
|
| +}
|
| +
|
| +void WebMediaPlayerImpl::putCurrentFrame(WebKit::WebVideoFrame* frame) {
|
| + scoped_refptr<media::VideoFrame> video_frame = WebVideoFrameImpl::toVideoFrame(frame);
|
| + proxy_->PutCurrentFrame(video_frame);
|
| +}
|
| +
|
| } // namespace webkit_glue
|
|
|