OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 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 12 matching lines...) Expand all Loading... |
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
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 #include <set> | 28 #include <set> |
29 #include <string> | 29 #include <string> |
30 #include <vector> | 30 #include <vector> |
31 | 31 |
32 #include "talk/app/webrtc/jsepsessiondescription.h" | 32 #include "talk/app/webrtc/jsepsessiondescription.h" |
| 33 #ifdef WEBRTC_ANDROID |
| 34 #include "talk/app/webrtc/test/androidtestinitializer.h" |
| 35 #endif |
33 #include "talk/app/webrtc/webrtcsdp.h" | 36 #include "talk/app/webrtc/webrtcsdp.h" |
34 #include "talk/media/base/constants.h" | 37 #include "talk/media/base/constants.h" |
35 #include "webrtc/p2p/base/constants.h" | 38 #include "webrtc/p2p/base/constants.h" |
36 #include "talk/session/media/mediasession.h" | 39 #include "talk/session/media/mediasession.h" |
37 #include "webrtc/base/gunit.h" | 40 #include "webrtc/base/gunit.h" |
38 #include "webrtc/base/logging.h" | 41 #include "webrtc/base/logging.h" |
39 #include "webrtc/base/messagedigest.h" | 42 #include "webrtc/base/messagedigest.h" |
40 #include "webrtc/base/scoped_ptr.h" | 43 #include "webrtc/base/scoped_ptr.h" |
41 #include "webrtc/base/sslfingerprint.h" | 44 #include "webrtc/base/sslfingerprint.h" |
42 #include "webrtc/base/stringencode.h" | 45 #include "webrtc/base/stringencode.h" |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
537 Replace(kAttributeIcePwdVideo, "", message); | 540 Replace(kAttributeIcePwdVideo, "", message); |
538 } | 541 } |
539 } | 542 } |
540 | 543 |
541 // WebRtcSdpTest | 544 // WebRtcSdpTest |
542 | 545 |
543 class WebRtcSdpTest : public testing::Test { | 546 class WebRtcSdpTest : public testing::Test { |
544 public: | 547 public: |
545 WebRtcSdpTest() | 548 WebRtcSdpTest() |
546 : jdesc_(kDummyString) { | 549 : jdesc_(kDummyString) { |
| 550 #ifdef WEBRTC_ANDROID |
| 551 webrtc::InitializeAndroidObjects(); |
| 552 #endif |
547 // AudioContentDescription | 553 // AudioContentDescription |
548 audio_desc_ = CreateAudioContentDescription(); | 554 audio_desc_ = CreateAudioContentDescription(); |
549 AudioCodec opus(111, "opus", 48000, 0, 2, 3); | 555 AudioCodec opus(111, "opus", 48000, 0, 2, 3); |
550 audio_desc_->AddCodec(opus); | 556 audio_desc_->AddCodec(opus); |
551 audio_desc_->AddCodec(AudioCodec(103, "ISAC", 16000, 32000, 1, 2)); | 557 audio_desc_->AddCodec(AudioCodec(103, "ISAC", 16000, 32000, 1, 2)); |
552 audio_desc_->AddCodec(AudioCodec(104, "ISAC", 32000, 56000, 1, 1)); | 558 audio_desc_->AddCodec(AudioCodec(104, "ISAC", 32000, 56000, 1, 1)); |
553 desc_.AddContent(kAudioContentName, NS_JINGLE_RTP, audio_desc_); | 559 desc_.AddContent(kAudioContentName, NS_JINGLE_RTP, audio_desc_); |
554 | 560 |
555 // VideoContentDescription | 561 // VideoContentDescription |
556 rtc::scoped_ptr<VideoContentDescription> video( | 562 rtc::scoped_ptr<VideoContentDescription> video( |
(...skipping 2189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2746 const cricket::MediaContentDescription* mdesc = | 2752 const cricket::MediaContentDescription* mdesc = |
2747 static_cast<const cricket::MediaContentDescription*>( | 2753 static_cast<const cricket::MediaContentDescription*>( |
2748 desc->contents()[i].description); | 2754 desc->contents()[i].description); |
2749 EXPECT_EQ(media_types[media_content_in_sdp[i]], mdesc->type()); | 2755 EXPECT_EQ(media_types[media_content_in_sdp[i]], mdesc->type()); |
2750 } | 2756 } |
2751 | 2757 |
2752 std::string serialized_sdp = webrtc::SdpSerialize(jdesc); | 2758 std::string serialized_sdp = webrtc::SdpSerialize(jdesc); |
2753 EXPECT_EQ(sdp_string, serialized_sdp); | 2759 EXPECT_EQ(sdp_string, serialized_sdp); |
2754 } | 2760 } |
2755 } | 2761 } |
OLD | NEW |