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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.h

Issue 1836043004: Cleanup the VideoAdapter (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed sprangs comments. Created 4 years, 8 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 void OnRtcpReceived(rtc::CopyOnWriteBuffer* packet, 168 void OnRtcpReceived(rtc::CopyOnWriteBuffer* packet,
169 const rtc::PacketTime& packet_time) override; 169 const rtc::PacketTime& packet_time) override;
170 void OnReadyToSend(bool ready) override; 170 void OnReadyToSend(bool ready) override;
171 void OnNetworkRouteChanged(const std::string& transport_name, 171 void OnNetworkRouteChanged(const std::string& transport_name,
172 const NetworkRoute& network_route) override; 172 const NetworkRoute& network_route) override;
173 void SetInterface(NetworkInterface* iface) override; 173 void SetInterface(NetworkInterface* iface) override;
174 174
175 // Implemented for VideoMediaChannelTest. 175 // Implemented for VideoMediaChannelTest.
176 bool sending() const { return sending_; } 176 bool sending() const { return sending_; }
177 177
178 // AdaptReasonEnum is used for expressing why a WebRtcVideoSendStream request
179 // a lower input frame size than the currently configured camera input frame
180 // size. There can be more than one reason OR:ed together.
181 enum AdaptReasonEnum {
pbos-webrtc 2016/04/05 10:17:41 enum AdaptReason should be enough
perkj_webrtc 2016/04/05 11:44:45 Done.
182 ADAPTREASON_NONE = 0,
183 ADAPTREASON_CPU = 1,
184 ADAPTREASON_BANDWIDTH = 2,
185 };
186
178 private: 187 private:
179 class WebRtcVideoReceiveStream; 188 class WebRtcVideoReceiveStream;
180 struct VideoCodecSettings { 189 struct VideoCodecSettings {
181 VideoCodecSettings(); 190 VideoCodecSettings();
182 191
183 bool operator==(const VideoCodecSettings& other) const; 192 bool operator==(const VideoCodecSettings& other) const;
184 bool operator!=(const VideoCodecSettings& other) const; 193 bool operator!=(const VideoCodecSettings& other) const;
185 194
186 VideoCodec codec; 195 VideoCodec codec;
187 webrtc::FecConfig fec; 196 webrtc::FecConfig fec;
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 // TODO(deadbeef): Don't duplicate information between 535 // TODO(deadbeef): Don't duplicate information between
527 // send_params/recv_params, rtp_extensions, options, etc. 536 // send_params/recv_params, rtp_extensions, options, etc.
528 VideoSendParameters send_params_; 537 VideoSendParameters send_params_;
529 VideoOptions default_send_options_; 538 VideoOptions default_send_options_;
530 VideoRecvParameters recv_params_; 539 VideoRecvParameters recv_params_;
531 }; 540 };
532 541
533 } // namespace cricket 542 } // namespace cricket
534 543
535 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 544 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698