OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 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 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1177 EncodedImageCallback* pre_decode_callback) { | 1177 EncodedImageCallback* pre_decode_callback) { |
1178 vcm_->RegisterPreDecodeImageCallback(pre_decode_callback); | 1178 vcm_->RegisterPreDecodeImageCallback(pre_decode_callback); |
1179 } | 1179 } |
1180 | 1180 |
1181 // TODO(pbos): Remove OnInitializeDecoder which is called from the RTP module, | 1181 // TODO(pbos): Remove OnInitializeDecoder which is called from the RTP module, |
1182 // any decoder resetting should be handled internally within the VCM. | 1182 // any decoder resetting should be handled internally within the VCM. |
1183 int32_t ViEChannel::OnInitializeDecoder( | 1183 int32_t ViEChannel::OnInitializeDecoder( |
1184 const int8_t payload_type, | 1184 const int8_t payload_type, |
1185 const char payload_name[RTP_PAYLOAD_NAME_SIZE], | 1185 const char payload_name[RTP_PAYLOAD_NAME_SIZE], |
1186 const int frequency, | 1186 const int frequency, |
1187 const uint8_t channels, | 1187 const size_t channels, |
1188 const uint32_t rate) { | 1188 const uint32_t rate) { |
1189 LOG(LS_INFO) << "OnInitializeDecoder " << static_cast<int>(payload_type) | 1189 LOG(LS_INFO) << "OnInitializeDecoder " << static_cast<int>(payload_type) |
1190 << " " << payload_name; | 1190 << " " << payload_name; |
1191 vcm_->ResetDecoder(); | 1191 vcm_->ResetDecoder(); |
1192 | 1192 |
1193 return 0; | 1193 return 0; |
1194 } | 1194 } |
1195 | 1195 |
1196 void ViEChannel::OnIncomingSSRCChanged(const uint32_t ssrc) { | 1196 void ViEChannel::OnIncomingSSRCChanged(const uint32_t ssrc) { |
1197 rtp_rtcp_modules_[0]->SetRemoteSSRC(ssrc); | 1197 rtp_rtcp_modules_[0]->SetRemoteSSRC(ssrc); |
(...skipping 11 matching lines...) Expand all Loading... |
1209 CriticalSectionScoped cs(crit_.get()); | 1209 CriticalSectionScoped cs(crit_.get()); |
1210 receive_stats_callback_ = receive_statistics_proxy; | 1210 receive_stats_callback_ = receive_statistics_proxy; |
1211 } | 1211 } |
1212 | 1212 |
1213 void ViEChannel::SetIncomingVideoStream( | 1213 void ViEChannel::SetIncomingVideoStream( |
1214 IncomingVideoStream* incoming_video_stream) { | 1214 IncomingVideoStream* incoming_video_stream) { |
1215 CriticalSectionScoped cs(crit_.get()); | 1215 CriticalSectionScoped cs(crit_.get()); |
1216 incoming_video_stream_ = incoming_video_stream; | 1216 incoming_video_stream_ = incoming_video_stream; |
1217 } | 1217 } |
1218 } // namespace webrtc | 1218 } // namespace webrtc |
OLD | NEW |