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

Side by Side Diff: webrtc/media/base/videosourceinterface.h

Issue 1695263002: Move direct use of VideoCapturer::VideoAdapter to VideoSinkWants. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Tried to address pthatchers comments. Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ 11 #ifndef WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_
12 #define WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ 12 #define WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_
13 13
14 #include <limits>
15
14 #include "webrtc/media/base/videosinkinterface.h" 16 #include "webrtc/media/base/videosinkinterface.h"
15 #include "webrtc/base/callback.h" 17 #include "webrtc/base/callback.h"
18 #include "webrtc/base/optional.h"
16 19
17 namespace rtc { 20 namespace rtc {
18 21
19 // VideoSinkWants is used for notifying the source of properties a video frame 22 // VideoSinkWants is used for notifying the source of properties a video frame
20 // should have when it is delivered to a certain sink. 23 // should have when it is delivered to a certain sink.
21 struct VideoSinkWants { 24 struct VideoSinkWants {
22 bool operator==(const VideoSinkWants& rh) const { 25 bool operator==(const VideoSinkWants& rh) const {
23 return rotation_applied == rh.rotation_applied; 26 return rotation_applied == rh.rotation_applied;
24 } 27 }
25 bool operator!=(const VideoSinkWants& rh) const { return !operator==(rh); } 28 bool operator!=(const VideoSinkWants& rh) const { return !operator==(rh); }
26 29
27 // Tells the source whether the sink wants frames with rotation applied. 30 // Tells the source whether the sink wants frames with rotation applied.
28 // By default, the rotation is applied by the source. 31 // By default, the rotation is applied by the source.
29 bool rotation_applied = true; 32 bool rotation_applied = true;
33
34 // Tells the source the maximum number of pixels the sink wants.
35 rtc::Optional<int> max_number_of_pixels;
30 }; 36 };
31 37
32 template <typename VideoFrameT> 38 template <typename VideoFrameT>
33 class VideoSourceInterface { 39 class VideoSourceInterface {
34 public: 40 public:
35 virtual void AddOrUpdateSink(VideoSinkInterface<VideoFrameT>* sink, 41 virtual void AddOrUpdateSink(VideoSinkInterface<VideoFrameT>* sink,
36 const VideoSinkWants& wants) = 0; 42 const VideoSinkWants& wants) = 0;
37 // RemoveSink must guarantee that at the time the method returns, 43 // RemoveSink must guarantee that at the time the method returns,
38 // there is no current and no future calls to VideoSinkInterface::OnFrame. 44 // there is no current and no future calls to VideoSinkInterface::OnFrame.
39 virtual void RemoveSink(VideoSinkInterface<VideoFrameT>* sink) = 0; 45 virtual void RemoveSink(VideoSinkInterface<VideoFrameT>* sink) = 0;
40 46
41 protected: 47 protected:
42 virtual ~VideoSourceInterface() {} 48 virtual ~VideoSourceInterface() {}
43 }; 49 };
44 50
45 } // namespace rtc 51 } // namespace rtc
46 #endif // WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ 52 #endif // WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698