diff options
| author | Guo-wei Shieh <guoweis@chromium.org> | 2015-03-31 19:42:39 -0700 |
|---|---|---|
| committer | Guo-wei Shieh <guoweis@chromium.org> | 2015-04-01 02:42:50 +0000 |
| commit | 1b1c15cad16de57053bb6aa8a916079e0534bdae (patch) | |
| tree | 75a67fb02c50cdbc002dd31700b7e08d19a362a3 /talk/media/webrtc/webrtcvideocapturer.cc | |
| parent | 4b3c0d6f34c379c2a06f654b62403876b20180c6 (diff) | |
| download | webrtc-1b1c15cad16de57053bb6aa8a916079e0534bdae.tar.gz | |
Enable CVO by default through webrtc pipeline.
All RTP packets from sender side will carry the rotation info. (will file a bug to track this) On the receiving side, only packets with marker bit set will be examined.
Tests completed:
1. android standalone to android standalone
2. android standalone to chrome (with and without this change)
3. android on chrome
BUG=4145
R=glaznev@webrtc.org, mflodman@webrtc.org, perkj@webrtc.org, pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/47399004
Cr-Commit-Position: refs/heads/master@{#8905}
Diffstat (limited to 'talk/media/webrtc/webrtcvideocapturer.cc')
| -rw-r--r-- | talk/media/webrtc/webrtcvideocapturer.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc index 0e8f56bfdd..956356ff7c 100644 --- a/talk/media/webrtc/webrtcvideocapturer.cc +++ b/talk/media/webrtc/webrtcvideocapturer.cc @@ -44,6 +44,7 @@ #include "webrtc/base/win32.h" // Need this to #include the impl files. #include "webrtc/modules/video_capture/include/video_capture_factory.h" +#include "webrtc/system_wrappers/interface/field_trial.h" namespace cricket { @@ -264,6 +265,13 @@ bool WebRtcVideoCapturer::SetApplyRotation(bool enable) { assert(module_); + const std::string group_name = + webrtc::field_trial::FindFullName("WebRTC-CVO"); + + if (group_name == "Disabled") { + return true; + } + if (!VideoCapturer::SetApplyRotation(enable)) { return false; } |