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 11 matching lines...) Expand all Loading... |
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
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/session/media/mediasession.h" |
| 33 #include "webrtc/api/jsepsessiondescription.h" |
33 #ifdef WEBRTC_ANDROID | 34 #ifdef WEBRTC_ANDROID |
34 #include "talk/app/webrtc/test/androidtestinitializer.h" | 35 #include "webrtc/api/test/androidtestinitializer.h" |
35 #endif | 36 #endif |
36 #include "talk/app/webrtc/webrtcsdp.h" | 37 #include "webrtc/api/webrtcsdp.h" |
37 #include "talk/session/media/mediasession.h" | |
38 #include "webrtc/base/gunit.h" | 38 #include "webrtc/base/gunit.h" |
39 #include "webrtc/base/logging.h" | 39 #include "webrtc/base/logging.h" |
40 #include "webrtc/base/messagedigest.h" | 40 #include "webrtc/base/messagedigest.h" |
41 #include "webrtc/base/scoped_ptr.h" | 41 #include "webrtc/base/scoped_ptr.h" |
42 #include "webrtc/base/sslfingerprint.h" | 42 #include "webrtc/base/sslfingerprint.h" |
43 #include "webrtc/base/stringencode.h" | 43 #include "webrtc/base/stringencode.h" |
44 #include "webrtc/base/stringutils.h" | 44 #include "webrtc/base/stringutils.h" |
45 #include "webrtc/media/base/constants.h" | 45 #include "webrtc/media/base/constants.h" |
46 #include "webrtc/p2p/base/constants.h" | 46 #include "webrtc/p2p/base/constants.h" |
47 | 47 |
(...skipping 2684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2732 const cricket::MediaContentDescription* mdesc = | 2732 const cricket::MediaContentDescription* mdesc = |
2733 static_cast<const cricket::MediaContentDescription*>( | 2733 static_cast<const cricket::MediaContentDescription*>( |
2734 desc->contents()[i].description); | 2734 desc->contents()[i].description); |
2735 EXPECT_EQ(media_types[media_content_in_sdp[i]], mdesc->type()); | 2735 EXPECT_EQ(media_types[media_content_in_sdp[i]], mdesc->type()); |
2736 } | 2736 } |
2737 | 2737 |
2738 std::string serialized_sdp = webrtc::SdpSerialize(jdesc); | 2738 std::string serialized_sdp = webrtc::SdpSerialize(jdesc); |
2739 EXPECT_EQ(sdp_string, serialized_sdp); | 2739 EXPECT_EQ(sdp_string, serialized_sdp); |
2740 } | 2740 } |
2741 } | 2741 } |
OLD | NEW |