OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1600 } | 1600 } |
1601 | 1601 |
1602 flexfec_enabled = true; | 1602 flexfec_enabled = true; |
1603 parameters_.config.rtp.flexfec.ssrc = flexfec_ssrc; | 1603 parameters_.config.rtp.flexfec.ssrc = flexfec_ssrc; |
1604 parameters_.config.rtp.flexfec.protected_media_ssrcs = {primary_ssrc}; | 1604 parameters_.config.rtp.flexfec.protected_media_ssrcs = {primary_ssrc}; |
1605 } | 1605 } |
1606 } | 1606 } |
1607 } | 1607 } |
1608 | 1608 |
1609 parameters_.config.rtp.c_name = sp.cname; | 1609 parameters_.config.rtp.c_name = sp.cname; |
| 1610 parameters_.config.track_id = sp.id; |
1610 if (rtp_extensions) { | 1611 if (rtp_extensions) { |
1611 parameters_.config.rtp.extensions = *rtp_extensions; | 1612 parameters_.config.rtp.extensions = *rtp_extensions; |
1612 } | 1613 } |
1613 parameters_.config.rtp.rtcp_mode = send_params.rtcp.reduced_size | 1614 parameters_.config.rtp.rtcp_mode = send_params.rtcp.reduced_size |
1614 ? webrtc::RtcpMode::kReducedSize | 1615 ? webrtc::RtcpMode::kReducedSize |
1615 : webrtc::RtcpMode::kCompound; | 1616 : webrtc::RtcpMode::kCompound; |
1616 if (codec_settings) { | 1617 if (codec_settings) { |
1617 bool force_encoder_allocation = false; | 1618 bool force_encoder_allocation = false; |
1618 SetCodec(*codec_settings, force_encoder_allocation); | 1619 SetCodec(*codec_settings, force_encoder_allocation); |
1619 } | 1620 } |
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2660 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - | 2661 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - |
2661 1); | 2662 1); |
2662 } | 2663 } |
2663 | 2664 |
2664 std::vector<webrtc::VideoStream> streams; | 2665 std::vector<webrtc::VideoStream> streams; |
2665 streams.push_back(stream); | 2666 streams.push_back(stream); |
2666 return streams; | 2667 return streams; |
2667 } | 2668 } |
2668 | 2669 |
2669 } // namespace cricket | 2670 } // namespace cricket |
OLD | NEW |