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

Side by Side Diff: webrtc/pc/channel_unittest.cc

Issue 1845673002: Removing `preference` field from `cricket::Codec`. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing sort order (got reversed when optimizations were made) Created 4 years, 8 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/sctp/sctpdataengine.cc ('k') | webrtc/pc/channelmanager_unittest.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 2009 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2009 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 30 matching lines...) Expand all
41 using cricket::CA_OFFER; 41 using cricket::CA_OFFER;
42 using cricket::CA_PRANSWER; 42 using cricket::CA_PRANSWER;
43 using cricket::CA_ANSWER; 43 using cricket::CA_ANSWER;
44 using cricket::CA_UPDATE; 44 using cricket::CA_UPDATE;
45 using cricket::FakeVoiceMediaChannel; 45 using cricket::FakeVoiceMediaChannel;
46 using cricket::ScreencastId; 46 using cricket::ScreencastId;
47 using cricket::StreamParams; 47 using cricket::StreamParams;
48 using cricket::TransportChannel; 48 using cricket::TransportChannel;
49 using rtc::WindowId; 49 using rtc::WindowId;
50 50
51 static const cricket::AudioCodec kPcmuCodec(0, "PCMU", 64000, 8000, 1, 0); 51 static const cricket::AudioCodec kPcmuCodec(0, "PCMU", 64000, 8000, 1);
52 static const cricket::AudioCodec kPcmaCodec(8, "PCMA", 64000, 8000, 1, 0); 52 static const cricket::AudioCodec kPcmaCodec(8, "PCMA", 64000, 8000, 1);
53 static const cricket::AudioCodec kIsacCodec(103, "ISAC", 40000, 16000, 1, 0); 53 static const cricket::AudioCodec kIsacCodec(103, "ISAC", 40000, 16000, 1);
54 static const cricket::VideoCodec kH264Codec(97, "H264", 640, 400, 30, 0); 54 static const cricket::VideoCodec kH264Codec(97, "H264", 640, 400, 30);
55 static const cricket::VideoCodec kH264SvcCodec(99, "H264-SVC", 320, 200, 15, 0); 55 static const cricket::VideoCodec kH264SvcCodec(99, "H264-SVC", 320, 200, 15);
56 static const cricket::DataCodec kGoogleDataCodec(101, "google-data", 0); 56 static const cricket::DataCodec kGoogleDataCodec(101, "google-data");
57 static const uint32_t kSsrc1 = 0x1111; 57 static const uint32_t kSsrc1 = 0x1111;
58 static const uint32_t kSsrc2 = 0x2222; 58 static const uint32_t kSsrc2 = 0x2222;
59 static const uint32_t kSsrc3 = 0x3333; 59 static const uint32_t kSsrc3 = 0x3333;
60 static const int kAudioPts[] = {0, 8}; 60 static const int kAudioPts[] = {0, 8};
61 static const int kVideoPts[] = {97, 99}; 61 static const int kVideoPts[] = {97, 99};
62 62
63 template <class ChannelT, 63 template <class ChannelT,
64 class MediaChannelT, 64 class MediaChannelT,
65 class ContentT, 65 class ContentT,
66 class CodecT, 66 class CodecT,
(...skipping 2743 matching lines...) Expand 10 before | Expand all | Expand 10 after
2810 }; 2810 };
2811 rtc::CopyOnWriteBuffer payload(data, 3); 2811 rtc::CopyOnWriteBuffer payload(data, 3);
2812 cricket::SendDataResult result; 2812 cricket::SendDataResult result;
2813 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result)); 2813 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
2814 EXPECT_EQ(params.ssrc, 2814 EXPECT_EQ(params.ssrc,
2815 media_channel1_->last_sent_data_params().ssrc); 2815 media_channel1_->last_sent_data_params().ssrc);
2816 EXPECT_EQ("foo", media_channel1_->last_sent_data()); 2816 EXPECT_EQ("foo", media_channel1_->last_sent_data());
2817 } 2817 }
2818 2818
2819 // TODO(pthatcher): TestSetReceiver? 2819 // TODO(pthatcher): TestSetReceiver?
OLDNEW
« no previous file with comments | « webrtc/media/sctp/sctpdataengine.cc ('k') | webrtc/pc/channelmanager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698