Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #include "webrtc/base/thread.h" | 31 #include "webrtc/base/thread.h" |
| 32 | 32 |
| 33 namespace cricket { | 33 namespace cricket { |
| 34 class ChannelManager; | 34 class ChannelManager; |
| 35 } // namespace cricket | 35 } // namespace cricket |
| 36 | 36 |
| 37 namespace webrtc { | 37 namespace webrtc { |
| 38 class Call; | 38 class Call; |
| 39 class VoiceEngine; | 39 class VoiceEngine; |
| 40 | 40 |
| 41 // Construction-time settings, passedon when creating MediaChannels. | |
|
pthatcher1
2016/02/05 17:11:30
passedon => passed on
nisse-webrtc
2016/02/08 09:02:32
Done.
| |
| 42 struct MediaConfig { | |
| 43 // Set DSCP value for packet sent from media channel. This flag | |
|
pthatcher1
2016/02/05 17:11:30
DSCP value for packet => DSCP on packets
from med
nisse-webrtc
2016/02/08 09:02:32
Done.
| |
| 44 // comes from the PeerConnection constraint 'googDscp'. | |
| 45 bool enable_dscp = false; | |
| 46 | |
| 47 // Video-specific config | |
| 48 | |
| 49 // Enable WebRTC Cpu Overuse Detection. This flag comes from the | |
|
pthatcher1
2016/02/05 17:11:30
Cpu => CPU
nisse-webrtc
2016/02/08 09:02:32
Done.
| |
| 50 // PeerConnection constraint 'googCpuOveruseDetection' and is | |
| 51 // checked in WebRtcVideoChannel2::OnLoadUpdate, where it's passed | |
| 52 // to VideoCapturer::video_adapter()->OnCpuResolutionRequest. | |
| 53 bool cpu_overuse_detection = true; | |
|
pthatcher1
2016/02/05 17:11:30
Please provide a blank line here
pthatcher1
2016/02/05 17:11:30
To be consistent, shouldn't this be enable_cpu_ove
nisse-webrtc
2016/02/08 09:02:32
Makes sense. (I just moved it over from VideoOptio
| |
| 54 // Set to true if the renderer has an algorithm of frame selection. | |
| 55 // If the value is true, then WebRTC will hand over a frame as soon as | |
| 56 // possible without delay, and rendering smoothness is completely the duty | |
| 57 // of the renderer; | |
| 58 // If the value is false, then WebRTC is responsible to delay frame release | |
| 59 // in order to increase rendering smoothness. | |
| 60 // | |
| 61 // This flag comes from PeerConnection's RtcConfiguration, but is | |
| 62 // currently only set by the command line flag | |
| 63 // 'disable-rtc-smoothness-algorithm'. | |
| 64 // WebRtcVideoChannel2::AddRecvStream copies it to the created | |
| 65 // WebRtcVideoReceiveStream, where it is returned by the | |
| 66 // SmoothsRenderedFrames method. This method is used by the | |
| 67 // VideoReceiveStream, where the value is passed on to the | |
| 68 // IncomingVideoStream constructor. | |
| 69 bool disable_prerenderer_smoothing = false; | |
| 70 }; | |
| 71 | |
| 41 // The MediaController currently owns shared state between media channels, but | 72 // The MediaController currently owns shared state between media channels, but |
| 42 // in the future will create and own RtpSenders and RtpReceivers. | 73 // in the future will create and own RtpSenders and RtpReceivers. |
| 43 class MediaControllerInterface { | 74 class MediaControllerInterface { |
| 44 public: | 75 public: |
| 45 static MediaControllerInterface* Create( | 76 static MediaControllerInterface* Create( |
| 46 rtc::Thread* worker_thread, | 77 rtc::Thread* worker_thread, |
| 78 const MediaConfig& config, | |
|
pthatcher1
2016/02/05 17:11:30
I think it should be the first argument.
nisse-webrtc
2016/02/08 09:02:32
Done.
| |
| 47 cricket::ChannelManager* channel_manager); | 79 cricket::ChannelManager* channel_manager); |
| 48 | 80 |
| 49 virtual ~MediaControllerInterface() {} | 81 virtual ~MediaControllerInterface() {} |
| 50 virtual webrtc::Call* call_w() = 0; | 82 virtual webrtc::Call* call_w() = 0; |
| 51 virtual cricket::ChannelManager* channel_manager() const = 0; | 83 virtual cricket::ChannelManager* channel_manager() const = 0; |
| 84 // TODO(nisse): Reference or pointer? | |
|
pthatcher1
2016/02/05 17:11:30
Reference (or copy; it's so small it doesn't matte
nisse-webrtc
2016/02/08 09:02:32
Done.
| |
| 85 virtual const MediaConfig* config() const = 0; | |
| 52 }; | 86 }; |
| 53 } // namespace webrtc | 87 } // namespace webrtc |
| 54 | 88 |
| 55 #endif // TALK_APP_WEBRTC_MEDIACONTROLLER_H_ | 89 #endif // TALK_APP_WEBRTC_MEDIACONTROLLER_H_ |
| OLD | NEW |