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

Side by Side Diff: pc/webrtcsession.cc

Issue 2826263004: Move responsibility for RTP header extensions on video receive. (Closed)
Patch Set: Crude rebase. Created 3 years, 2 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 | « media/engine/webrtcvideoengine_unittest.cc ('k') | test/call_test.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 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 } 977 }
978 978
979 bool WebRtcSession::PushdownMediaDescription( 979 bool WebRtcSession::PushdownMediaDescription(
980 cricket::ContentAction action, 980 cricket::ContentAction action,
981 cricket::ContentSource source, 981 cricket::ContentSource source,
982 std::string* err) { 982 std::string* err) {
983 const SessionDescription* sdesc = 983 const SessionDescription* sdesc =
984 (source == cricket::CS_LOCAL ? local_description() : remote_description()) 984 (source == cricket::CS_LOCAL ? local_description() : remote_description())
985 ->description(); 985 ->description();
986 RTC_DCHECK(sdesc); 986 RTC_DCHECK(sdesc);
987 #if 0
988 if (source == cricket::CS_LOCAL) {
989 const SessionDescription* local_desc = local_description()->description();
990 const ContentInfo* content_info = GetFirstDataContent(local_desc);
991 RTC_DCHECK(IsVideoContent(content_info));
992 const cricket::VideoContentDescription* content_desc =
993 static_cast<const cricket::VideoContentDescription*>(
994 content_info->description);
995 if (content_desc->rtp_header_extensions_set())
996 call_->SetVideoReceiveRtpHeaderExtensions(
997 content_desc->rtp_header_extensions());
998
999 return ch->PushdownLocalDescription(local_description()->description(),
1000 action, err);
1001 #endif
987 bool all_success = true; 1002 bool all_success = true;
988 for (auto* channel : Channels()) { 1003 for (auto* channel : Channels()) {
989 // TODO(steveanton): Add support for multiple channels of the same type. 1004 // TODO(steveanton): Add support for multiple channels of the same type.
990 const ContentInfo* content_info = 1005 const ContentInfo* content_info =
991 cricket::GetFirstMediaContent(sdesc->contents(), channel->media_type()); 1006 cricket::GetFirstMediaContent(sdesc->contents(), channel->media_type());
992 if (!content_info) { 1007 if (!content_info) {
993 continue; 1008 continue;
994 } 1009 }
995 const MediaContentDescription* content_desc = 1010 const MediaContentDescription* content_desc =
996 static_cast<const MediaContentDescription*>(content_info->description); 1011 static_cast<const MediaContentDescription*>(content_info->description);
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after
2504 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); 2519 (rtp_data_channel_->rtcp_dtls_transport() != nullptr);
2505 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); 2520 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release());
2506 transport_controller_->DestroyDtlsTransport( 2521 transport_controller_->DestroyDtlsTransport(
2507 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); 2522 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
2508 if (need_to_delete_rtcp) { 2523 if (need_to_delete_rtcp) {
2509 transport_controller_->DestroyDtlsTransport( 2524 transport_controller_->DestroyDtlsTransport(
2510 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); 2525 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
2511 } 2526 }
2512 } 2527 }
2513 } // namespace webrtc 2528 } // namespace webrtc
OLDNEW
« no previous file with comments | « media/engine/webrtcvideoengine_unittest.cc ('k') | test/call_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698