| 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 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1203 void ViEChannel::RegisterPreDecodeImageCallback( | 1203 void ViEChannel::RegisterPreDecodeImageCallback( |
| 1204 EncodedImageCallback* pre_decode_callback) { | 1204 EncodedImageCallback* pre_decode_callback) { |
| 1205 vcm_->RegisterPreDecodeImageCallback(pre_decode_callback); | 1205 vcm_->RegisterPreDecodeImageCallback(pre_decode_callback); |
| 1206 } | 1206 } |
| 1207 | 1207 |
| 1208 int32_t ViEChannel::OnInitializeDecoder( | 1208 int32_t ViEChannel::OnInitializeDecoder( |
| 1209 const int32_t id, | 1209 const int32_t id, |
| 1210 const int8_t payload_type, | 1210 const int8_t payload_type, |
| 1211 const char payload_name[RTP_PAYLOAD_NAME_SIZE], | 1211 const char payload_name[RTP_PAYLOAD_NAME_SIZE], |
| 1212 const int frequency, | 1212 const int frequency, |
| 1213 const uint8_t channels, | 1213 const size_t channels, |
| 1214 const uint32_t rate) { | 1214 const uint32_t rate) { |
| 1215 LOG(LS_INFO) << "OnInitializeDecoder " << static_cast<int>(payload_type) | 1215 LOG(LS_INFO) << "OnInitializeDecoder " << static_cast<int>(payload_type) |
| 1216 << " " << payload_name; | 1216 << " " << payload_name; |
| 1217 vcm_->ResetDecoder(); | 1217 vcm_->ResetDecoder(); |
| 1218 | 1218 |
| 1219 CriticalSectionScoped cs(crit_.get()); | 1219 CriticalSectionScoped cs(crit_.get()); |
| 1220 decoder_reset_ = true; | 1220 decoder_reset_ = true; |
| 1221 return 0; | 1221 return 0; |
| 1222 } | 1222 } |
| 1223 | 1223 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 1243 CriticalSectionScoped cs(crit_.get()); | 1243 CriticalSectionScoped cs(crit_.get()); |
| 1244 vcm_receive_stats_callback_ = receive_statistics_proxy; | 1244 vcm_receive_stats_callback_ = receive_statistics_proxy; |
| 1245 } | 1245 } |
| 1246 | 1246 |
| 1247 void ViEChannel::SetIncomingVideoStream( | 1247 void ViEChannel::SetIncomingVideoStream( |
| 1248 IncomingVideoStream* incoming_video_stream) { | 1248 IncomingVideoStream* incoming_video_stream) { |
| 1249 CriticalSectionScoped cs(crit_.get()); | 1249 CriticalSectionScoped cs(crit_.get()); |
| 1250 incoming_video_stream_ = incoming_video_stream; | 1250 incoming_video_stream_ = incoming_video_stream; |
| 1251 } | 1251 } |
| 1252 } // namespace webrtc | 1252 } // namespace webrtc |
| OLD | NEW |