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

Side by Side Diff: talk/session/media/mediasession.cc

Issue 1418123003: Adding reduced size RTCP configuration down to the video stream level. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 bool add_legacy_stream, 719 bool add_legacy_stream,
720 StreamParamsVec* current_streams, 720 StreamParamsVec* current_streams,
721 MediaContentDescriptionImpl<C>* offer) { 721 MediaContentDescriptionImpl<C>* offer) {
722 offer->AddCodecs(codecs); 722 offer->AddCodecs(codecs);
723 offer->SortCodecs(); 723 offer->SortCodecs();
724 724
725 if (secure_policy == SEC_REQUIRED) { 725 if (secure_policy == SEC_REQUIRED) {
726 offer->set_crypto_required(CT_SDES); 726 offer->set_crypto_required(CT_SDES);
727 } 727 }
728 offer->set_rtcp_mux(options.rtcp_mux_enabled); 728 offer->set_rtcp_mux(options.rtcp_mux_enabled);
729 // TODO(pthatcher): Once we support this, enable it in CreateOffer.
730 // offer->set_rtcp_reduced_size(true);
pthatcher1 2015/10/23 20:40:01 If we fix VideoSendStream::SignalNetworkState, I t
Taylor Brandstetter 2015/11/11 19:42:40 I'll go with the latter option and change this to
729 offer->set_multistream(options.is_muc); 731 offer->set_multistream(options.is_muc);
730 offer->set_rtp_header_extensions(rtp_extensions); 732 offer->set_rtp_header_extensions(rtp_extensions);
731 733
732 if (!AddStreamParams( 734 if (!AddStreamParams(
733 offer->type(), options.streams, current_streams, 735 offer->type(), options.streams, current_streams,
734 offer, add_legacy_stream)) { 736 offer, add_legacy_stream)) {
735 return false; 737 return false;
736 } 738 }
737 739
738 #ifdef HAVE_SRTP 740 #ifdef HAVE_SRTP
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 answer->AddCodecs(negotiated_codecs); 999 answer->AddCodecs(negotiated_codecs);
998 answer->SortCodecs(); 1000 answer->SortCodecs();
999 answer->set_protocol(offer->protocol()); 1001 answer->set_protocol(offer->protocol());
1000 RtpHeaderExtensions negotiated_rtp_extensions; 1002 RtpHeaderExtensions negotiated_rtp_extensions;
1001 NegotiateRtpHeaderExtensions(local_rtp_extenstions, 1003 NegotiateRtpHeaderExtensions(local_rtp_extenstions,
1002 offer->rtp_header_extensions(), 1004 offer->rtp_header_extensions(),
1003 &negotiated_rtp_extensions); 1005 &negotiated_rtp_extensions);
1004 answer->set_rtp_header_extensions(negotiated_rtp_extensions); 1006 answer->set_rtp_header_extensions(negotiated_rtp_extensions);
1005 1007
1006 answer->set_rtcp_mux(options.rtcp_mux_enabled && offer->rtcp_mux()); 1008 answer->set_rtcp_mux(options.rtcp_mux_enabled && offer->rtcp_mux());
1009 // TODO(pthatcher): Once we support this, enable it in CreateOffer.
1010 // answer->set_rtcp_reduced_size(offer->rtcp_reduced_size());
1007 1011
1008 if (sdes_policy != SEC_DISABLED) { 1012 if (sdes_policy != SEC_DISABLED) {
1009 CryptoParams crypto; 1013 CryptoParams crypto;
1010 if (SelectCrypto(offer, bundle_enabled, &crypto)) { 1014 if (SelectCrypto(offer, bundle_enabled, &crypto)) {
1011 if (current_cryptos) { 1015 if (current_cryptos) {
1012 FindMatchingCrypto(*current_cryptos, crypto, &crypto); 1016 FindMatchingCrypto(*current_cryptos, crypto, &crypto);
1013 } 1017 }
1014 answer->AddCrypto(crypto); 1018 answer->AddCrypto(crypto);
1015 } 1019 }
1016 } 1020 }
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
1901 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO)); 1905 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
1902 } 1906 }
1903 1907
1904 const DataContentDescription* GetFirstDataContentDescription( 1908 const DataContentDescription* GetFirstDataContentDescription(
1905 const SessionDescription* sdesc) { 1909 const SessionDescription* sdesc) {
1906 return static_cast<const DataContentDescription*>( 1910 return static_cast<const DataContentDescription*>(
1907 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA)); 1911 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
1908 } 1912 }
1909 1913
1910 } // namespace cricket 1914 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698