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

Side by Side Diff: webrtc/video/payload_router.cc

Issue 1952443002: [H264][Simulcast] Implement the simulcast logic for h264 encoder Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix a few issues with the patch Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 rtp->codecHeader.VP9.gof.CopyGofInfoVP9(info->codecSpecific.VP9.gof); 68 rtp->codecHeader.VP9.gof.CopyGofInfoVP9(info->codecSpecific.VP9.gof);
69 } 69 }
70 70
71 rtp->codecHeader.VP9.num_ref_pics = info->codecSpecific.VP9.num_ref_pics; 71 rtp->codecHeader.VP9.num_ref_pics = info->codecSpecific.VP9.num_ref_pics;
72 for (int i = 0; i < info->codecSpecific.VP9.num_ref_pics; ++i) 72 for (int i = 0; i < info->codecSpecific.VP9.num_ref_pics; ++i)
73 rtp->codecHeader.VP9.pid_diff[i] = info->codecSpecific.VP9.p_diff[i]; 73 rtp->codecHeader.VP9.pid_diff[i] = info->codecSpecific.VP9.p_diff[i];
74 return; 74 return;
75 } 75 }
76 case kVideoCodecH264: 76 case kVideoCodecH264:
77 rtp->codec = kRtpVideoH264; 77 rtp->codec = kRtpVideoH264;
78 rtp->simulcastIdx = info->codecSpecific.H264.simulcastIdx;
78 return; 79 return;
79 case kVideoCodecGeneric: 80 case kVideoCodecGeneric:
80 rtp->codec = kRtpVideoGeneric; 81 rtp->codec = kRtpVideoGeneric;
81 rtp->simulcastIdx = info->codecSpecific.generic.simulcast_idx; 82 rtp->simulcastIdx = info->codecSpecific.generic.simulcast_idx;
82 return; 83 return;
83 default: 84 default:
84 return; 85 return;
85 } 86 }
86 } 87 }
87 88
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 rtc::CritScope lock(&crit_); 191 rtc::CritScope lock(&crit_);
191 for (size_t i = 0; i < num_sending_modules_; ++i) { 192 for (size_t i = 0; i < num_sending_modules_; ++i) {
192 size_t module_payload_length = rtp_modules_[i]->MaxDataPayloadLength(); 193 size_t module_payload_length = rtp_modules_[i]->MaxDataPayloadLength();
193 if (module_payload_length < min_payload_length) 194 if (module_payload_length < min_payload_length)
194 min_payload_length = module_payload_length; 195 min_payload_length = module_payload_length;
195 } 196 }
196 return min_payload_length; 197 return min_payload_length;
197 } 198 }
198 199
199 } // namespace webrtc 200 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698