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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Fix android CE Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 int32_t RTPSender::RegisterRtpHeaderExtension(RTPExtensionType type, 186 int32_t RTPSender::RegisterRtpHeaderExtension(RTPExtensionType type,
187 uint8_t id) { 187 uint8_t id) {
188 rtc::CritScope lock(&send_critsect_); 188 rtc::CritScope lock(&send_critsect_);
189 switch (type) { 189 switch (type) {
190 case kRtpExtensionVideoRotation: 190 case kRtpExtensionVideoRotation:
191 case kRtpExtensionPlayoutDelay: 191 case kRtpExtensionPlayoutDelay:
192 case kRtpExtensionTransmissionTimeOffset: 192 case kRtpExtensionTransmissionTimeOffset:
193 case kRtpExtensionAbsoluteSendTime: 193 case kRtpExtensionAbsoluteSendTime:
194 case kRtpExtensionAudioLevel: 194 case kRtpExtensionAudioLevel:
195 case kRtpExtensionTransportSequenceNumber: 195 case kRtpExtensionTransportSequenceNumber:
196 case kRtpExtensionVideoContentType:
196 return rtp_header_extension_map_.Register(type, id); 197 return rtp_header_extension_map_.Register(type, id);
197 case kRtpExtensionNone: 198 case kRtpExtensionNone:
198 case kRtpExtensionNumberOfExtensions: 199 case kRtpExtensionNumberOfExtensions:
199 LOG(LS_ERROR) << "Invalid RTP extension type for registration."; 200 LOG(LS_ERROR) << "Invalid RTP extension type for registration.";
200 return -1; 201 return -1;
201 } 202 }
202 return -1; 203 return -1;
203 } 204 }
204 205
205 bool RTPSender::IsRtpHeaderExtensionRegistered(RTPExtensionType type) const { 206 bool RTPSender::IsRtpHeaderExtensionRegistered(RTPExtensionType type) const {
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 if (rtp_overhead_bytes_per_packet_ == packet.headers_size()) { 1271 if (rtp_overhead_bytes_per_packet_ == packet.headers_size()) {
1271 return; 1272 return;
1272 } 1273 }
1273 rtp_overhead_bytes_per_packet_ = packet.headers_size(); 1274 rtp_overhead_bytes_per_packet_ = packet.headers_size();
1274 overhead_bytes_per_packet = rtp_overhead_bytes_per_packet_; 1275 overhead_bytes_per_packet = rtp_overhead_bytes_per_packet_;
1275 } 1276 }
1276 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet); 1277 overhead_observer_->OnOverheadChanged(overhead_bytes_per_packet);
1277 } 1278 }
1278 1279
1279 } // namespace webrtc 1280 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698