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

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: Fixing patch conflicts Created 5 years 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 | « talk/session/media/mediasession.h ('k') | webrtc/video/video_send_stream.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 * 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 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 bool add_legacy_stream, 753 bool add_legacy_stream,
754 StreamParamsVec* current_streams, 754 StreamParamsVec* current_streams,
755 MediaContentDescriptionImpl<C>* offer) { 755 MediaContentDescriptionImpl<C>* offer) {
756 offer->AddCodecs(codecs); 756 offer->AddCodecs(codecs);
757 offer->SortCodecs(); 757 offer->SortCodecs();
758 758
759 if (secure_policy == SEC_REQUIRED) { 759 if (secure_policy == SEC_REQUIRED) {
760 offer->set_crypto_required(CT_SDES); 760 offer->set_crypto_required(CT_SDES);
761 } 761 }
762 offer->set_rtcp_mux(options.rtcp_mux_enabled); 762 offer->set_rtcp_mux(options.rtcp_mux_enabled);
763 // TODO(deadbeef): Once we're sure this works correctly, enable it in
764 // CreateOffer.
765 // if (offer->type() == cricket::MEDIA_TYPE_VIDEO) {
766 // offer->set_rtcp_reduced_size(true);
767 // }
763 offer->set_multistream(options.is_muc); 768 offer->set_multistream(options.is_muc);
764 offer->set_rtp_header_extensions(rtp_extensions); 769 offer->set_rtp_header_extensions(rtp_extensions);
765 770
766 if (!AddStreamParams( 771 if (!AddStreamParams(
767 offer->type(), options.streams, current_streams, 772 offer->type(), options.streams, current_streams,
768 offer, add_legacy_stream)) { 773 offer, add_legacy_stream)) {
769 return false; 774 return false;
770 } 775 }
771 776
772 #ifdef HAVE_SRTP 777 #ifdef HAVE_SRTP
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 answer->AddCodecs(negotiated_codecs); 1036 answer->AddCodecs(negotiated_codecs);
1032 answer->SortCodecs(); 1037 answer->SortCodecs();
1033 answer->set_protocol(offer->protocol()); 1038 answer->set_protocol(offer->protocol());
1034 RtpHeaderExtensions negotiated_rtp_extensions; 1039 RtpHeaderExtensions negotiated_rtp_extensions;
1035 NegotiateRtpHeaderExtensions(local_rtp_extenstions, 1040 NegotiateRtpHeaderExtensions(local_rtp_extenstions,
1036 offer->rtp_header_extensions(), 1041 offer->rtp_header_extensions(),
1037 &negotiated_rtp_extensions); 1042 &negotiated_rtp_extensions);
1038 answer->set_rtp_header_extensions(negotiated_rtp_extensions); 1043 answer->set_rtp_header_extensions(negotiated_rtp_extensions);
1039 1044
1040 answer->set_rtcp_mux(options.rtcp_mux_enabled && offer->rtcp_mux()); 1045 answer->set_rtcp_mux(options.rtcp_mux_enabled && offer->rtcp_mux());
1046 // TODO(deadbeef): Once we're sure this works correctly, enable it in
1047 // CreateAnswer.
1048 // if (answer->type() == cricket::MEDIA_TYPE_VIDEO) {
1049 // answer->set_rtcp_reduced_size(offer->rtcp_reduced_size());
1050 // }
1041 1051
1042 if (sdes_policy != SEC_DISABLED) { 1052 if (sdes_policy != SEC_DISABLED) {
1043 CryptoParams crypto; 1053 CryptoParams crypto;
1044 if (SelectCrypto(offer, bundle_enabled, &crypto)) { 1054 if (SelectCrypto(offer, bundle_enabled, &crypto)) {
1045 if (current_cryptos) { 1055 if (current_cryptos) {
1046 FindMatchingCrypto(*current_cryptos, crypto, &crypto); 1056 FindMatchingCrypto(*current_cryptos, crypto, &crypto);
1047 } 1057 }
1048 answer->AddCrypto(crypto); 1058 answer->AddCrypto(crypto);
1049 } 1059 }
1050 } 1060 }
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO)); 1972 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
1963 } 1973 }
1964 1974
1965 const DataContentDescription* GetFirstDataContentDescription( 1975 const DataContentDescription* GetFirstDataContentDescription(
1966 const SessionDescription* sdesc) { 1976 const SessionDescription* sdesc) {
1967 return static_cast<const DataContentDescription*>( 1977 return static_cast<const DataContentDescription*>(
1968 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA)); 1978 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
1969 } 1979 }
1970 1980
1971 } // namespace cricket 1981 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/session/media/mediasession.h ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698