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 2108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2119 type(type), | 2119 type(type), |
2120 external(external) { | 2120 external(external) { |
2121 if (external) { | 2121 if (external) { |
2122 external_decoder = decoder; | 2122 external_decoder = decoder; |
2123 this->decoder = | 2123 this->decoder = |
2124 new webrtc::VideoDecoderSoftwareFallbackWrapper(type, external_decoder); | 2124 new webrtc::VideoDecoderSoftwareFallbackWrapper(type, external_decoder); |
2125 } | 2125 } |
2126 } | 2126 } |
2127 | 2127 |
2128 WebRtcVideoChannel2::WebRtcVideoReceiveStream::~WebRtcVideoReceiveStream() { | 2128 WebRtcVideoChannel2::WebRtcVideoReceiveStream::~WebRtcVideoReceiveStream() { |
| 2129 if (flexfec_stream_) { |
| 2130 call_->DestroyFlexfecReceiveStream(flexfec_stream_); |
| 2131 } |
2129 call_->DestroyVideoReceiveStream(stream_); | 2132 call_->DestroyVideoReceiveStream(stream_); |
2130 ClearDecoders(&allocated_decoders_); | 2133 ClearDecoders(&allocated_decoders_); |
2131 } | 2134 } |
2132 | 2135 |
2133 const std::vector<uint32_t>& | 2136 const std::vector<uint32_t>& |
2134 WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetSsrcs() const { | 2137 WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetSsrcs() const { |
2135 return stream_params_.ssrcs; | 2138 return stream_params_.ssrcs; |
2136 } | 2139 } |
2137 | 2140 |
2138 rtc::Optional<uint32_t> | 2141 rtc::Optional<uint32_t> |
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2512 rtx_mapping[video_codecs[i].codec.id] != | 2515 rtx_mapping[video_codecs[i].codec.id] != |
2513 ulpfec_config.red_payload_type) { | 2516 ulpfec_config.red_payload_type) { |
2514 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2517 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2515 } | 2518 } |
2516 } | 2519 } |
2517 | 2520 |
2518 return video_codecs; | 2521 return video_codecs; |
2519 } | 2522 } |
2520 | 2523 |
2521 } // namespace cricket | 2524 } // namespace cricket |
OLD | NEW |