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

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

Issue 2471783002: Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Created 4 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 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
(...skipping 13 matching lines...) Expand all
24 // thread. 24 // thread.
25 class AdaptedVideoTrackSource 25 class AdaptedVideoTrackSource
26 : public webrtc::Notifier<webrtc::VideoTrackSourceInterface> { 26 : public webrtc::Notifier<webrtc::VideoTrackSourceInterface> {
27 public: 27 public:
28 AdaptedVideoTrackSource(); 28 AdaptedVideoTrackSource();
29 29
30 protected: 30 protected:
31 // Checks the apply_rotation() flag. If the frame needs rotation, and it is a 31 // Checks the apply_rotation() flag. If the frame needs rotation, and it is a
32 // plain memory frame, it is rotated. Subclasses producing native frames must 32 // plain memory frame, it is rotated. Subclasses producing native frames must
33 // handle apply_rotation() themselves. 33 // handle apply_rotation() themselves.
34 void OnFrame(const webrtc::VideoFrame& frame); 34 void OnFrame(const cricket::VideoFrame& frame);
35 35
36 // Reports the appropriate frame size after adaptation. Returns true 36 // Reports the appropriate frame size after adaptation. Returns true
37 // if a frame is wanted. Returns false if there are no interested 37 // if a frame is wanted. Returns false if there are no interested
38 // sinks, or if the VideoAdapter decides to drop the frame. 38 // sinks, or if the VideoAdapter decides to drop the frame.
39 bool AdaptFrame(int width, 39 bool AdaptFrame(int width,
40 int height, 40 int height,
41 int64_t time_us, 41 int64_t time_us,
42 int* out_width, 42 int* out_width,
43 int* out_height, 43 int* out_height,
44 int* crop_width, 44 int* crop_width,
45 int* crop_height, 45 int* crop_height,
46 int* crop_x, 46 int* crop_x,
47 int* crop_y); 47 int* crop_y);
48 48
49 // Returns the current value of the apply_rotation flag, derived 49 // Returns the current value of the apply_rotation flag, derived
50 // from the VideoSinkWants of registered sinks. The value is derived 50 // from the VideoSinkWants of registered sinks. The value is derived
51 // from sinks' wants, in AddOrUpdateSink and RemoveSink. Beware that 51 // from sinks' wants, in AddOrUpdateSink and RemoveSink. Beware that
52 // when using this method from a different thread, the value may 52 // when using this method from a different thread, the value may
53 // become stale before it is used. 53 // become stale before it is used.
54 bool apply_rotation(); 54 bool apply_rotation();
55 55
56 cricket::VideoAdapter* video_adapter() { return &video_adapter_; } 56 cricket::VideoAdapter* video_adapter() { return &video_adapter_; }
57 57
58 private: 58 private:
59 // Implements rtc::VideoSourceInterface. 59 // Implements rtc::VideoSourceInterface.
60 void AddOrUpdateSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink, 60 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
61 const rtc::VideoSinkWants& wants) override; 61 const rtc::VideoSinkWants& wants) override;
62 void RemoveSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override; 62 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
63 63
64 // Part of VideoTrackSourceInterface. 64 // Part of VideoTrackSourceInterface.
65 bool GetStats(Stats* stats) override; 65 bool GetStats(Stats* stats) override;
66 66
67 void OnSinkWantsChanged(const rtc::VideoSinkWants& wants); 67 void OnSinkWantsChanged(const rtc::VideoSinkWants& wants);
68 68
69 rtc::ThreadChecker thread_checker_; 69 rtc::ThreadChecker thread_checker_;
70 70
71 cricket::VideoAdapter video_adapter_; 71 cricket::VideoAdapter video_adapter_;
72 72
73 rtc::CriticalSection stats_crit_; 73 rtc::CriticalSection stats_crit_;
74 rtc::Optional<Stats> stats_ GUARDED_BY(stats_crit_); 74 rtc::Optional<Stats> stats_ GUARDED_BY(stats_crit_);
75 75
76 VideoBroadcaster broadcaster_; 76 VideoBroadcaster broadcaster_;
77 }; 77 };
78 78
79 } // namespace rtc 79 } // namespace rtc
80 80
81 #endif // WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ 81 #endif // WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/main_wnd.cc ('k') | webrtc/media/base/adaptedvideotracksource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698