From 1e1cb3bc787a85e1791f737f831d00ee08db364d Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Thu, 10 Nov 2011 02:07:41 +0000 Subject: Move code in src/remoting to the new callbacks. BUG=None TEST=Remoting still works. Review URL: http://codereview.chromium.org/8493020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109367 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/client/frame_consumer.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'remoting/client/frame_consumer.h') diff --git a/remoting/client/frame_consumer.h b/remoting/client/frame_consumer.h index 339b3a4..187b3d5 100644 --- a/remoting/client/frame_consumer.h +++ b/remoting/client/frame_consumer.h @@ -18,12 +18,12 @@ class FrameConsumer { // Request a frame be allocated from the FrameConsumer. // - // If a frame cannot be allocated to fit the format, and height/width + // If a frame cannot be allocated to fit the format, and |size| // requirements, |frame_out| will be set to NULL. // - // An allocated frame will have at least the width and height requested, but - // may be bigger. Query the retrun frame for the actual frame size, stride, - // etc. + // An allocated frame will have at least the |size| requested, but + // may be bigger. Query the retrun frame for the actual frame size, + // stride, etc. // // The AllocateFrame call is asynchronous. From invocation, until when the // |done| callback is invoked, |frame_out| should be considered to be locked @@ -35,12 +35,9 @@ class FrameConsumer { // All frames retrieved via the AllocateFrame call must be released by a // corresponding call ReleaseFrame(scoped_refptr* frame_out. virtual void AllocateFrame(media::VideoFrame::Format format, - size_t width, - size_t height, - base::TimeDelta timestamp, - base::TimeDelta duration, + const SkISize& size, scoped_refptr* frame_out, - Task* done) = 0; + const base::Closure& done) = 0; virtual void ReleaseFrame(media::VideoFrame* frame) = 0; @@ -52,7 +49,7 @@ class FrameConsumer { // callback is invoked. virtual void OnPartialFrameOutput(media::VideoFrame* frame, RectVector* rects, - Task* done) = 0; + const base::Closure& done) = 0; private: DISALLOW_COPY_AND_ASSIGN(FrameConsumer); -- cgit v1.1