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

Side by Side Diff: webrtc/api/jsepsessiondescription.cc

Issue 1845673002: Removing `preference` field from `cricket::Codec`. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing sort order (got reversed when optimizations were made) Created 4 years, 8 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 | « webrtc/api/jsepsessiondescription.h ('k') | webrtc/api/jsepsessiondescription_unittest.cc » ('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 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Limit default max video codec size for Android to avoid 50 // Limit default max video codec size for Android to avoid
51 // HW VP8 codec initialization failure for resolutions higher 51 // HW VP8 codec initialization failure for resolutions higher
52 // than 1280x720 or 720x1280. 52 // than 1280x720 or 720x1280.
53 // Same patch for iOS to support 720P in portrait mode. 53 // Same patch for iOS to support 720P in portrait mode.
54 const int JsepSessionDescription::kMaxVideoCodecWidth = 1280; 54 const int JsepSessionDescription::kMaxVideoCodecWidth = 1280;
55 const int JsepSessionDescription::kMaxVideoCodecHeight = 1280; 55 const int JsepSessionDescription::kMaxVideoCodecHeight = 1280;
56 #else 56 #else
57 const int JsepSessionDescription::kMaxVideoCodecWidth = 1920; 57 const int JsepSessionDescription::kMaxVideoCodecWidth = 1920;
58 const int JsepSessionDescription::kMaxVideoCodecHeight = 1080; 58 const int JsepSessionDescription::kMaxVideoCodecHeight = 1080;
59 #endif 59 #endif
60 const int JsepSessionDescription::kDefaultVideoCodecPreference = 1;
61 60
62 SessionDescriptionInterface* CreateSessionDescription(const std::string& type, 61 SessionDescriptionInterface* CreateSessionDescription(const std::string& type,
63 const std::string& sdp, 62 const std::string& sdp,
64 SdpParseError* error) { 63 SdpParseError* error) {
65 if (!IsTypeSupported(type)) { 64 if (!IsTypeSupported(type)) {
66 return NULL; 65 return NULL;
67 } 66 }
68 67
69 JsepSessionDescription* jsep_desc = new JsepSessionDescription(type); 68 JsepSessionDescription* jsep_desc = new JsepSessionDescription(type);
70 if (!jsep_desc->Initialize(sdp, error)) { 69 if (!jsep_desc->Initialize(sdp, error)) {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 const std::string& transport_name = candidate.transport_name(); 203 const std::string& transport_name = candidate.transport_name();
205 for (size_t i = 0; i < description_->contents().size(); ++i) { 204 for (size_t i = 0; i < description_->contents().size(); ++i) {
206 if (transport_name == description_->contents().at(i).name) { 205 if (transport_name == description_->contents().at(i).name) {
207 return static_cast<int>(i); 206 return static_cast<int>(i);
208 } 207 }
209 } 208 }
210 return -1; 209 return -1;
211 } 210 }
212 211
213 } // namespace webrtc 212 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/jsepsessiondescription.h ('k') | webrtc/api/jsepsessiondescription_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698