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

Side by Side Diff: media/base/video_capturer_source.h

Issue 1304983005: Revert of Change VideoCaptureDeliverFrameCB's signature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months 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 unified diff | Download patch
« no previous file with comments | « content/renderer/pepper/pepper_platform_video_capture.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURER_SOURCE_H_ 5 #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURER_SOURCE_H_
6 #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURER_SOURCE_H_ 6 #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURER_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 22 matching lines...) Expand all
33 // implementation should not present the frame before this point-in-time. This 33 // implementation should not present the frame before this point-in-time. This
34 // value is NOT a high-resolution timestamp, and so it should not be used as a 34 // value is NOT a high-resolution timestamp, and so it should not be used as a
35 // presentation time; but, instead, it should be used for buffering playback 35 // presentation time; but, instead, it should be used for buffering playback
36 // and for A/V synchronization purposes. NOTE: It is possible for this value 36 // and for A/V synchronization purposes. NOTE: It is possible for this value
37 // to be null if the current implementation lacks this timing information. 37 // to be null if the current implementation lacks this timing information.
38 // 38 //
39 // |video_frame->timestamp()| gives the presentation timestamp of the video 39 // |video_frame->timestamp()| gives the presentation timestamp of the video
40 // frame relative to the first frame generated by the corresponding source. 40 // frame relative to the first frame generated by the corresponding source.
41 // Because a source can start generating frames before a subscriber is added, 41 // Because a source can start generating frames before a subscriber is added,
42 // the first video frame delivered may not have timestamp equal to 0. 42 // the first video frame delivered may not have timestamp equal to 0.
43 typedef base::Callback<void( 43 typedef base::Callback<
44 const scoped_refptr<media::VideoFrame>& video_frame, 44 void(const scoped_refptr<media::VideoFrame>& video_frame,
45 base::TimeTicks estimated_capture_time)> VideoCaptureDeliverFrameCB; 45 const base::TimeTicks& estimated_capture_time)>
46 VideoCaptureDeliverFrameCB;
46 47
47 typedef base::Callback<void(const media::VideoCaptureFormats&)> 48 typedef base::Callback<void(const media::VideoCaptureFormats&)>
48 VideoCaptureDeviceFormatsCB; 49 VideoCaptureDeviceFormatsCB;
49 50
50 typedef base::Callback<void(bool)> RunningCallback; 51 typedef base::Callback<void(bool)> RunningCallback;
51 52
52 // Collects the formats that can currently be used. 53 // Collects the formats that can currently be used.
53 // |max_requested_height|, |max_requested_width|, and 54 // |max_requested_height|, |max_requested_width|, and
54 // |max_requested_frame_rate| is used by Tab and Screen capture to decide what 55 // |max_requested_frame_rate| is used by Tab and Screen capture to decide what
55 // resolution/framerate to generate. |callback| is triggered when the formats 56 // resolution/framerate to generate. |callback| is triggered when the formats
(...skipping 24 matching lines...) Expand all
80 // Stops capturing frames and clears all callbacks including the 81 // Stops capturing frames and clears all callbacks including the
81 // SupportedFormatsCallback callback. Note that queued frame callbacks 82 // SupportedFormatsCallback callback. Note that queued frame callbacks
82 // may still occur after this call, so the caller must take care to 83 // may still occur after this call, so the caller must take care to
83 // use refcounted or weak references in |new_frame_callback|. 84 // use refcounted or weak references in |new_frame_callback|.
84 virtual void StopCapture() = 0; 85 virtual void StopCapture() = 0;
85 }; 86 };
86 87
87 } // namespace media 88 } // namespace media
88 89
89 #endif // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURER_SOURCE_H_ 90 #endif // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURER_SOURCE_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_platform_video_capture.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698