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

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

Issue 2337453002: H.264 packetization mode 0 (try 2) (Closed)
Patch Set: Upload try 2 (with rebase) Created 4 years, 1 month 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/video/end_to_end_tests.cc ('k') | webrtc/video/video_send_stream_tests.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 (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->codecHeader.H264.packetization_mode =
79 info->codecSpecific.H264.packetization_mode;
78 return; 80 return;
79 case kVideoCodecGeneric: 81 case kVideoCodecGeneric:
80 rtp->codec = kRtpVideoGeneric; 82 rtp->codec = kRtpVideoGeneric;
81 rtp->simulcastIdx = info->codecSpecific.generic.simulcast_idx; 83 rtp->simulcastIdx = info->codecSpecific.generic.simulcast_idx;
82 return; 84 return;
83 default: 85 default:
84 return; 86 return;
85 } 87 }
86 } 88 }
87 89
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 rtc::CritScope lock(&crit_); 157 rtc::CritScope lock(&crit_);
156 for (size_t i = 0; i < rtp_modules_.size(); ++i) { 158 for (size_t i = 0; i < rtp_modules_.size(); ++i) {
157 size_t module_payload_length = rtp_modules_[i]->MaxDataPayloadLength(); 159 size_t module_payload_length = rtp_modules_[i]->MaxDataPayloadLength();
158 if (module_payload_length < min_payload_length) 160 if (module_payload_length < min_payload_length)
159 min_payload_length = module_payload_length; 161 min_payload_length = module_payload_length;
160 } 162 }
161 return min_payload_length; 163 return min_payload_length;
162 } 164 }
163 165
164 } // namespace webrtc 166 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/end_to_end_tests.cc ('k') | webrtc/video/video_send_stream_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698