| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 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 #include <algorithm> | 11 #include <algorithm> |
| 12 #include <map> | 12 #include <map> |
| 13 #include <memory> | 13 #include <memory> |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "webrtc/base/arraysize.h" | 16 #include "webrtc/base/arraysize.h" |
| 17 #include "webrtc/base/gunit.h" | 17 #include "webrtc/base/gunit.h" |
| 18 #include "webrtc/base/stringutils.h" | 18 #include "webrtc/base/stringutils.h" |
| 19 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" | 19 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" |
| 20 #include "webrtc/media/base/testutils.h" | 20 #include "webrtc/media/base/testutils.h" |
| 21 #include "webrtc/media/base/videoengine_unittest.h" | 21 #include "webrtc/media/base/videoengine_unittest.h" |
| 22 #include "webrtc/media/engine/fakewebrtccall.h" | 22 #include "webrtc/media/engine/fakewebrtccall.h" |
| 23 #include "webrtc/media/engine/fakewebrtcvideoengine.h" | 23 #include "webrtc/media/engine/fakewebrtcvideoengine.h" |
| 24 #include "webrtc/media/engine/simulcast.h" | 24 #include "webrtc/media/engine/simulcast.h" |
| 25 #include "webrtc/media/engine/webrtcvideochannelfactory.h" | |
| 26 #include "webrtc/media/engine/webrtcvideoengine2.h" | 25 #include "webrtc/media/engine/webrtcvideoengine2.h" |
| 27 #include "webrtc/media/engine/webrtcvoiceengine.h" | 26 #include "webrtc/media/engine/webrtcvoiceengine.h" |
| 28 #include "webrtc/test/field_trial.h" | 27 #include "webrtc/test/field_trial.h" |
| 29 #include "webrtc/video_encoder.h" | 28 #include "webrtc/video_encoder.h" |
| 30 | 29 |
| 31 using webrtc::RtpExtension; | 30 using webrtc::RtpExtension; |
| 32 | 31 |
| 33 namespace { | 32 namespace { |
| 34 static const int kDefaultQpMax = 56; | 33 static const int kDefaultQpMax = 56; |
| 35 static const int kDefaultFramerate = 30; | 34 static const int kDefaultFramerate = 30; |
| (...skipping 3821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3857 } | 3856 } |
| 3858 | 3857 |
| 3859 // Test that we normalize send codec format size in simulcast. | 3858 // Test that we normalize send codec format size in simulcast. |
| 3860 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { | 3859 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { |
| 3861 cricket::VideoCodec codec(kVp8Codec270p); | 3860 cricket::VideoCodec codec(kVp8Codec270p); |
| 3862 codec.width += 1; | 3861 codec.width += 1; |
| 3863 codec.height += 1; | 3862 codec.height += 1; |
| 3864 VerifySimulcastSettings(codec, 2, 2); | 3863 VerifySimulcastSettings(codec, 2, 2); |
| 3865 } | 3864 } |
| 3866 } // namespace cricket | 3865 } // namespace cricket |
| OLD | NEW |