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

Side by Side Diff: webrtc/api/webrtcsdp_unittest.cc

Issue 2408153002: Remove cricket::VideoCodec with, height and framerate properties (Closed)
Patch Set: Rebased Created 4 years, 2 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/api/webrtcsdp.cc ('k') | webrtc/media/base/codec.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 * Copyright 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 1039
1040 // Creates a video content description with no streams, and some default 1040 // Creates a video content description with no streams, and some default
1041 // configuration. 1041 // configuration.
1042 VideoContentDescription* CreateVideoContentDescription() { 1042 VideoContentDescription* CreateVideoContentDescription() {
1043 VideoContentDescription* video = new VideoContentDescription(); 1043 VideoContentDescription* video = new VideoContentDescription();
1044 video->AddCrypto(CryptoParams( 1044 video->AddCrypto(CryptoParams(
1045 1, "AES_CM_128_HMAC_SHA1_80", 1045 1, "AES_CM_128_HMAC_SHA1_80",
1046 "inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32", "")); 1046 "inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32", ""));
1047 video->set_protocol(cricket::kMediaProtocolSavpf); 1047 video->set_protocol(cricket::kMediaProtocolSavpf);
1048 video->AddCodec( 1048 video->AddCodec(
1049 VideoCodec(120, JsepSessionDescription::kDefaultVideoCodecName, 1049 VideoCodec(120, JsepSessionDescription::kDefaultVideoCodecName));
1050 JsepSessionDescription::kMaxVideoCodecWidth,
1051 JsepSessionDescription::kMaxVideoCodecHeight,
1052 JsepSessionDescription::kDefaultVideoCodecFramerate));
1053 return video; 1050 return video;
1054 } 1051 }
1055 1052
1056 template <class MCD> 1053 template <class MCD>
1057 void CompareMediaContentDescription(const MCD* cd1, 1054 void CompareMediaContentDescription(const MCD* cd1,
1058 const MCD* cd2) { 1055 const MCD* cd2) {
1059 // type 1056 // type
1060 EXPECT_EQ(cd1->type(), cd1->type()); 1057 EXPECT_EQ(cd1->type(), cd1->type());
1061 1058
1062 // content direction 1059 // content direction
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after
3196 "o=- 18446744069414584320 18446462598732840960 IN IP4 127.0.0.1\r\n" 3193 "o=- 18446744069414584320 18446462598732840960 IN IP4 127.0.0.1\r\n"
3197 "s=-\r\n" 3194 "s=-\r\n"
3198 "t=0 0\r\n" 3195 "t=0 0\r\n"
3199 "m=video 9 UDP/DTLS/SCTP 120\r\n" 3196 "m=video 9 UDP/DTLS/SCTP 120\r\n"
3200 "a=sctp-port 5000\r\n" 3197 "a=sctp-port 5000\r\n"
3201 "a=fmtp:108 foo=10\r\n"; 3198 "a=fmtp:108 foo=10\r\n";
3202 3199
3203 ExpectParseFailure(std::string(kSdpWithSctpPortInVideoDescription), 3200 ExpectParseFailure(std::string(kSdpWithSctpPortInVideoDescription),
3204 "sctp-port"); 3201 "sctp-port");
3205 } 3202 }
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsdp.cc ('k') | webrtc/media/base/codec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698