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, |
11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
15 * | 15 * |
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
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 "talk/app/webrtc/webrtcsdp.h" | 28 #include "webrtc/api/webrtcsdp.h" |
29 | 29 |
30 #include <ctype.h> | 30 #include <ctype.h> |
31 #include <limits.h> | 31 #include <limits.h> |
32 #include <stdio.h> | 32 #include <stdio.h> |
33 #include <algorithm> | 33 #include <algorithm> |
34 #include <string> | 34 #include <string> |
35 #include <vector> | 35 #include <vector> |
36 | 36 |
37 #include "talk/app/webrtc/jsepicecandidate.h" | |
38 #include "talk/app/webrtc/jsepsessiondescription.h" | |
39 #include "talk/session/media/mediasession.h" | 37 #include "talk/session/media/mediasession.h" |
| 38 #include "webrtc/api/jsepicecandidate.h" |
| 39 #include "webrtc/api/jsepsessiondescription.h" |
40 #include "webrtc/base/arraysize.h" | 40 #include "webrtc/base/arraysize.h" |
41 #include "webrtc/base/common.h" | 41 #include "webrtc/base/common.h" |
42 #include "webrtc/base/logging.h" | 42 #include "webrtc/base/logging.h" |
43 #include "webrtc/base/messagedigest.h" | 43 #include "webrtc/base/messagedigest.h" |
44 #include "webrtc/base/stringutils.h" | 44 #include "webrtc/base/stringutils.h" |
45 #include "webrtc/media/base/codec.h" | 45 #include "webrtc/media/base/codec.h" |
46 #include "webrtc/media/base/constants.h" | 46 #include "webrtc/media/base/constants.h" |
47 #include "webrtc/media/base/cryptoparams.h" | 47 #include "webrtc/media/base/cryptoparams.h" |
48 #include "webrtc/media/base/rtputils.h" | 48 #include "webrtc/media/base/rtputils.h" |
49 #include "webrtc/media/sctp/sctpdataengine.h" | 49 #include "webrtc/media/sctp/sctpdataengine.h" |
(...skipping 3024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3074 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( | 3074 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( |
3075 media_desc, payload_type, feedback_param); | 3075 media_desc, payload_type, feedback_param); |
3076 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { | 3076 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { |
3077 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( | 3077 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( |
3078 media_desc, payload_type, feedback_param); | 3078 media_desc, payload_type, feedback_param); |
3079 } | 3079 } |
3080 return true; | 3080 return true; |
3081 } | 3081 } |
3082 | 3082 |
3083 } // namespace webrtc | 3083 } // namespace webrtc |
OLD | NEW |