OLD | NEW |
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 using cricket::VideoCodec; | 77 using cricket::VideoCodec; |
78 using cricket::DataCodec; | 78 using cricket::DataCodec; |
79 using cricket::NS_JINGLE_RTP; | 79 using cricket::NS_JINGLE_RTP; |
80 using cricket::MEDIA_TYPE_AUDIO; | 80 using cricket::MEDIA_TYPE_AUDIO; |
81 using cricket::MEDIA_TYPE_VIDEO; | 81 using cricket::MEDIA_TYPE_VIDEO; |
82 using cricket::MEDIA_TYPE_DATA; | 82 using cricket::MEDIA_TYPE_DATA; |
83 using cricket::RtpHeaderExtension; | 83 using cricket::RtpHeaderExtension; |
84 using cricket::SEC_DISABLED; | 84 using cricket::SEC_DISABLED; |
85 using cricket::SEC_ENABLED; | 85 using cricket::SEC_ENABLED; |
86 using cricket::SEC_REQUIRED; | 86 using cricket::SEC_REQUIRED; |
87 using cricket::CS_AES_CM_128_HMAC_SHA1_32; | 87 using rtc::CS_AES_CM_128_HMAC_SHA1_32; |
88 using cricket::CS_AES_CM_128_HMAC_SHA1_80; | 88 using rtc::CS_AES_CM_128_HMAC_SHA1_80; |
89 | 89 |
90 static const AudioCodec kAudioCodecs1[] = { | 90 static const AudioCodec kAudioCodecs1[] = { |
91 AudioCodec(103, "ISAC", 16000, -1, 1, 6), | 91 AudioCodec(103, "ISAC", 16000, -1, 1, 6), |
92 AudioCodec(102, "iLBC", 8000, 13300, 1, 5), | 92 AudioCodec(102, "iLBC", 8000, 13300, 1, 5), |
93 AudioCodec(0, "PCMU", 8000, 64000, 1, 4), | 93 AudioCodec(0, "PCMU", 8000, 64000, 1, 4), |
94 AudioCodec(8, "PCMA", 8000, 64000, 1, 3), | 94 AudioCodec(8, "PCMA", 8000, 64000, 1, 3), |
95 AudioCodec(117, "red", 8000, 0, 1, 2), | 95 AudioCodec(117, "red", 8000, 0, 1, 2), |
96 AudioCodec(107, "CN", 48000, 0, 1, 1) | 96 AudioCodec(107, "CN", 48000, 0, 1, 1) |
97 }; | 97 }; |
98 | 98 |
(...skipping 2207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2306 offer.reset(f1_.CreateOffer(options, NULL)); | 2306 offer.reset(f1_.CreateOffer(options, NULL)); |
2307 ASSERT_TRUE(offer.get() != NULL); | 2307 ASSERT_TRUE(offer.get() != NULL); |
2308 audio_content = offer->GetContentByName("audio"); | 2308 audio_content = offer->GetContentByName("audio"); |
2309 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); | 2309 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); |
2310 rtc::scoped_ptr<SessionDescription> answer( | 2310 rtc::scoped_ptr<SessionDescription> answer( |
2311 f1_.CreateAnswer(offer.get(), options, NULL)); | 2311 f1_.CreateAnswer(offer.get(), options, NULL)); |
2312 ASSERT_TRUE(answer.get() != NULL); | 2312 ASSERT_TRUE(answer.get() != NULL); |
2313 audio_content = answer->GetContentByName("audio"); | 2313 audio_content = answer->GetContentByName("audio"); |
2314 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); | 2314 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); |
2315 } | 2315 } |
OLD | NEW |