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

Side by Side Diff: webrtc/media/webrtc/webrtcvideoengine2_unittest.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoengine2.cc ('k') | webrtc/media/webrtc/webrtcvideoframe.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 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 13 matching lines...) Expand all
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifdef HAVE_WEBRTC_VIDEO 28 #ifdef HAVE_WEBRTC_VIDEO
29 29
30 #include <algorithm> 30 #include <algorithm>
31 #include <map> 31 #include <map>
32 #include <vector> 32 #include <vector>
33 33
34 #include "talk/media/base/testutils.h"
35 #include "talk/media/base/videoengine_unittest.h"
36 #include "talk/media/webrtc/fakewebrtccall.h"
37 #include "talk/media/webrtc/fakewebrtcvideoengine.h"
38 #include "talk/media/webrtc/simulcast.h"
39 #include "talk/media/webrtc/webrtcvideochannelfactory.h"
40 #include "talk/media/webrtc/webrtcvideoengine2.h"
41 #include "talk/media/webrtc/webrtcvoiceengine.h"
42 #include "webrtc/base/arraysize.h" 34 #include "webrtc/base/arraysize.h"
43 #include "webrtc/base/gunit.h" 35 #include "webrtc/base/gunit.h"
44 #include "webrtc/base/stringutils.h" 36 #include "webrtc/base/stringutils.h"
37 #include "webrtc/media/base/testutils.h"
38 #include "webrtc/media/base/videoengine_unittest.h"
39 #include "webrtc/media/webrtc/fakewebrtccall.h"
40 #include "webrtc/media/webrtc/fakewebrtcvideoengine.h"
41 #include "webrtc/media/webrtc/simulcast.h"
42 #include "webrtc/media/webrtc/webrtcvideochannelfactory.h"
43 #include "webrtc/media/webrtc/webrtcvideoengine2.h"
44 #include "webrtc/media/webrtc/webrtcvoiceengine.h"
45 #include "webrtc/test/field_trial.h" 45 #include "webrtc/test/field_trial.h"
46 #include "webrtc/video_encoder.h" 46 #include "webrtc/video_encoder.h"
47 47
48 namespace { 48 namespace {
49 static const int kDefaultQpMax = 56; 49 static const int kDefaultQpMax = 56;
50 static const int kDefaultFramerate = 30; 50 static const int kDefaultFramerate = 30;
51 51
52 static const cricket::VideoCodec kVp8Codec720p(100, "VP8", 1280, 720, 30, 0); 52 static const cricket::VideoCodec kVp8Codec720p(100, "VP8", 1280, 720, 30, 0);
53 static const cricket::VideoCodec kVp8Codec360p(100, "VP8", 640, 360, 30, 0); 53 static const cricket::VideoCodec kVp8Codec360p(100, "VP8", 640, 360, 30, 0);
54 static const cricket::VideoCodec kVp8Codec270p(100, "VP8", 480, 270, 30, 0); 54 static const cricket::VideoCodec kVp8Codec270p(100, "VP8", 480, 270, 30, 0);
(...skipping 2995 matching lines...) Expand 10 before | Expand all | Expand 10 after
3050 // Test that we normalize send codec format size in simulcast. 3050 // Test that we normalize send codec format size in simulcast.
3051 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { 3051 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) {
3052 cricket::VideoCodec codec(kVp8Codec270p); 3052 cricket::VideoCodec codec(kVp8Codec270p);
3053 codec.width += 1; 3053 codec.width += 1;
3054 codec.height += 1; 3054 codec.height += 1;
3055 VerifySimulcastSettings(codec, 2, 2); 3055 VerifySimulcastSettings(codec, 2, 2);
3056 } 3056 }
3057 } // namespace cricket 3057 } // namespace cricket
3058 3058
3059 #endif // HAVE_WEBRTC_VIDEO 3059 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoengine2.cc ('k') | webrtc/media/webrtc/webrtcvideoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698