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

Side by Side Diff: webrtc/api/jsepsessiondescription_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/jsepsessiondescription.cc ('k') | webrtc/api/webrtcsdp.cc » ('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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 new cricket::AudioContentDescription()); 44 new cricket::AudioContentDescription());
45 45
46 // VideoContentDescription 46 // VideoContentDescription
47 std::unique_ptr<cricket::VideoContentDescription> video( 47 std::unique_ptr<cricket::VideoContentDescription> video(
48 new cricket::VideoContentDescription()); 48 new cricket::VideoContentDescription());
49 49
50 audio->AddCodec(cricket::AudioCodec(103, "ISAC", 16000, 0, 0)); 50 audio->AddCodec(cricket::AudioCodec(103, "ISAC", 16000, 0, 0));
51 desc->AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP, 51 desc->AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP,
52 audio.release()); 52 audio.release());
53 53
54 video->AddCodec(cricket::VideoCodec(120, "VP8", 640, 480, 30)); 54 video->AddCodec(cricket::VideoCodec(120, "VP8"));
55 desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP, 55 desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP,
56 video.release()); 56 video.release());
57 57
58 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo( 58 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo(
59 cricket::CN_AUDIO, 59 cricket::CN_AUDIO,
60 cricket::TransportDescription( 60 cricket::TransportDescription(
61 std::vector<std::string>(), kCandidateUfragVoice, kCandidatePwdVoice, 61 std::vector<std::string>(), kCandidateUfragVoice, kCandidatePwdVoice,
62 cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, NULL)))); 62 cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, NULL))));
63 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo( 63 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo(
64 cricket::CN_VIDEO, 64 cricket::CN_VIDEO,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); 221 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate));
222 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); 222 std::string sdp_with_candidate = Serialize(jsep_desc_.get());
223 EXPECT_NE(sdp, sdp_with_candidate); 223 EXPECT_NE(sdp, sdp_with_candidate);
224 224
225 std::unique_ptr<SessionDescriptionInterface> parsed_jsep_desc( 225 std::unique_ptr<SessionDescriptionInterface> parsed_jsep_desc(
226 DeSerialize(sdp_with_candidate)); 226 DeSerialize(sdp_with_candidate));
227 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); 227 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get());
228 228
229 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); 229 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate);
230 } 230 }
OLDNEW
« no previous file with comments | « webrtc/api/jsepsessiondescription.cc ('k') | webrtc/api/webrtcsdp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698