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

Unified Diff: remoting/client/frame_consumer.h

Issue 8493020: Move code in src/remoting to the new callbacks. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: - Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/chromoting_client.cc ('k') | remoting/client/input_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/frame_consumer.h
diff --git a/remoting/client/frame_consumer.h b/remoting/client/frame_consumer.h
index 339b3a4d453c4ee8c6d922d396ba2cdea875a37a..187b3d56b6e694d7d6112357ffced68fe739cc15 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<VideoFrame>* 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<media::VideoFrame>* 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);
« no previous file with comments | « remoting/client/chromoting_client.cc ('k') | remoting/client/input_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698