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

Side by Side Diff: talk/app/webrtc/jsepsessiondescription.cc

Issue 1237613003: Remove deprecated functions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Call new function from objc. Created 5 years, 5 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 | « talk/app/webrtc/jsepicecandidate.cc ('k') | talk/app/webrtc/objc/RTCICECandidate.mm » ('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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 // Same patch for iOS to support 720P in portrait mode. 69 // Same patch for iOS to support 720P in portrait mode.
70 const int JsepSessionDescription::kMaxVideoCodecWidth = 1280; 70 const int JsepSessionDescription::kMaxVideoCodecWidth = 1280;
71 const int JsepSessionDescription::kMaxVideoCodecHeight = 1280; 71 const int JsepSessionDescription::kMaxVideoCodecHeight = 1280;
72 #else 72 #else
73 const int JsepSessionDescription::kMaxVideoCodecWidth = 1920; 73 const int JsepSessionDescription::kMaxVideoCodecWidth = 1920;
74 const int JsepSessionDescription::kMaxVideoCodecHeight = 1080; 74 const int JsepSessionDescription::kMaxVideoCodecHeight = 1080;
75 #endif 75 #endif
76 const int JsepSessionDescription::kDefaultVideoCodecPreference = 1; 76 const int JsepSessionDescription::kDefaultVideoCodecPreference = 1;
77 77
78 SessionDescriptionInterface* CreateSessionDescription(const std::string& type, 78 SessionDescriptionInterface* CreateSessionDescription(const std::string& type,
79 const std::string& sdp) {
80 return CreateSessionDescription(type, sdp, NULL);
81 }
82
83 SessionDescriptionInterface* CreateSessionDescription(const std::string& type,
84 const std::string& sdp, 79 const std::string& sdp,
85 SdpParseError* error) { 80 SdpParseError* error) {
86 if (!IsTypeSupported(type)) { 81 if (!IsTypeSupported(type)) {
87 return NULL; 82 return NULL;
88 } 83 }
89 84
90 JsepSessionDescription* jsep_desc = new JsepSessionDescription(type); 85 JsepSessionDescription* jsep_desc = new JsepSessionDescription(type);
91 if (!jsep_desc->Initialize(sdp, error)) { 86 if (!jsep_desc->Initialize(sdp, error)) {
92 delete jsep_desc; 87 delete jsep_desc;
93 return NULL; 88 return NULL;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 if (!found) { 193 if (!found) {
199 // If the sdp_mid is presented but we can't find a match, we consider 194 // If the sdp_mid is presented but we can't find a match, we consider
200 // this as an error. 195 // this as an error.
201 return false; 196 return false;
202 } 197 }
203 } 198 }
204 return true; 199 return true;
205 } 200 }
206 201
207 } // namespace webrtc 202 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/jsepicecandidate.cc ('k') | talk/app/webrtc/objc/RTCICECandidate.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698