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

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

Issue 1247293002: Add support for transport wide sequence numbers (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase, again Created 5 years, 4 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/video/video_receive_stream.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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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
11 #include "webrtc/video/video_send_stream.h" 11 #include "webrtc/video/video_send_stream.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <sstream> 14 #include <sstream>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/modules/pacing/include/packet_router.h"
20 #include "webrtc/system_wrappers/interface/logging.h" 21 #include "webrtc/system_wrappers/interface/logging.h"
21 #include "webrtc/system_wrappers/interface/trace_event.h" 22 #include "webrtc/system_wrappers/interface/trace_event.h"
22 #include "webrtc/video/video_capture_input.h" 23 #include "webrtc/video/video_capture_input.h"
23 #include "webrtc/video_engine/vie_channel.h" 24 #include "webrtc/video_engine/vie_channel.h"
24 #include "webrtc/video_engine/vie_channel_group.h" 25 #include "webrtc/video_engine/vie_channel_group.h"
25 #include "webrtc/video_engine/vie_defines.h" 26 #include "webrtc/video_engine/vie_defines.h"
26 #include "webrtc/video_engine/vie_encoder.h" 27 #include "webrtc/video_engine/vie_encoder.h"
27 #include "webrtc/video_send_stream.h" 28 #include "webrtc/video_send_stream.h"
28 29
29 namespace webrtc { 30 namespace webrtc {
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 int id = config_.rtp.extensions[i].id; 130 int id = config_.rtp.extensions[i].id;
130 // One-byte-extension local identifiers are in the range 1-14 inclusive. 131 // One-byte-extension local identifiers are in the range 1-14 inclusive.
131 DCHECK_GE(id, 1); 132 DCHECK_GE(id, 1);
132 DCHECK_LE(id, 14); 133 DCHECK_LE(id, 14);
133 if (extension == RtpExtension::kTOffset) { 134 if (extension == RtpExtension::kTOffset) {
134 CHECK_EQ(0, vie_channel_->SetSendTimestampOffsetStatus(true, id)); 135 CHECK_EQ(0, vie_channel_->SetSendTimestampOffsetStatus(true, id));
135 } else if (extension == RtpExtension::kAbsSendTime) { 136 } else if (extension == RtpExtension::kAbsSendTime) {
136 CHECK_EQ(0, vie_channel_->SetSendAbsoluteSendTimeStatus(true, id)); 137 CHECK_EQ(0, vie_channel_->SetSendAbsoluteSendTimeStatus(true, id));
137 } else if (extension == RtpExtension::kVideoRotation) { 138 } else if (extension == RtpExtension::kVideoRotation) {
138 CHECK_EQ(0, vie_channel_->SetSendVideoRotationStatus(true, id)); 139 CHECK_EQ(0, vie_channel_->SetSendVideoRotationStatus(true, id));
140 } else if (extension == RtpExtension::kTransportSequenceNumber) {
141 CHECK_EQ(0, vie_channel_->SetSendTransportSequenceNumber(true, id));
139 } else { 142 } else {
140 RTC_NOTREACHED() << "Registering unsupported RTP extension."; 143 RTC_NOTREACHED() << "Registering unsupported RTP extension.";
141 } 144 }
142 } 145 }
143 146
144 // TODO(pbos): Consider configuring REMB in Call. 147 // TODO(pbos): Consider configuring REMB in Call.
145 channel_group_->SetChannelRembStatus(true, false, vie_channel_); 148 channel_group_->SetChannelRembStatus(true, false, vie_channel_);
146 149
147 // Enable NACK, FEC or both. 150 // Enable NACK, FEC or both.
148 const bool enable_protection_nack = config_.rtp.nack.rtp_history_ms > 0; 151 const bool enable_protection_nack = config_.rtp.nack.rtp_history_ms > 0;
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 vie_channel_->IsSendingFecEnabled()); 502 vie_channel_->IsSendingFecEnabled());
500 503
501 // Restart the media flow 504 // Restart the media flow
502 vie_encoder_->Restart(); 505 vie_encoder_->Restart();
503 506
504 return true; 507 return true;
505 } 508 }
506 509
507 } // namespace internal 510 } // namespace internal
508 } // namespace webrtc 511 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video/video_send_stream_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698