Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 283 LOG(LS_INFO) << "Received first " | 283 LOG(LS_INFO) << "Received first " |
| 284 << (frame->Complete() ? "complete" : "incomplete") | 284 << (frame->Complete() ? "complete" : "incomplete") |
| 285 << " decodable video frame"; | 285 << " decodable video frame"; |
| 286 } | 286 } |
| 287 | 287 |
| 288 const int32_t ret = Decode(*frame); | 288 const int32_t ret = Decode(*frame); |
| 289 _receiver.ReleaseFrame(frame); | 289 _receiver.ReleaseFrame(frame); |
| 290 return ret; | 290 return ret; |
| 291 } | 291 } |
| 292 | 292 |
| 293 // NOTE! Ugly hack to give the video receiver a frame to decode. | |
|
stefan-webrtc
2016/11/08 10:41:34
Add TODO to remove. When can it be cleaned up? And
philipel
2016/11/08 12:28:39
Done.
| |
| 294 // Used for the WebRTC-NewVideoJitterBuffer experiment. | |
| 295 int32_t VideoReceiver::Decode(const webrtc::VCMEncodedFrame* frame) { | |
| 296 rtc::CritScope lock(&receive_crit_); | |
| 297 return Decode(*frame); | |
| 298 } | |
| 299 | |
| 293 int32_t VideoReceiver::RequestSliceLossIndication( | 300 int32_t VideoReceiver::RequestSliceLossIndication( |
| 294 const uint64_t pictureID) const { | 301 const uint64_t pictureID) const { |
| 295 TRACE_EVENT1("webrtc", "RequestSLI", "picture_id", pictureID); | 302 TRACE_EVENT1("webrtc", "RequestSLI", "picture_id", pictureID); |
| 296 rtc::CritScope cs(&process_crit_); | 303 rtc::CritScope cs(&process_crit_); |
| 297 if (_frameTypeCallback != nullptr) { | 304 if (_frameTypeCallback != nullptr) { |
| 298 const int32_t ret = | 305 const int32_t ret = |
| 299 _frameTypeCallback->SliceLossIndicationRequest(pictureID); | 306 _frameTypeCallback->SliceLossIndicationRequest(pictureID); |
| 300 if (ret < 0) { | 307 if (ret < 0) { |
| 301 return ret; | 308 return ret; |
| 302 } | 309 } |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 496 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, | 503 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, |
| 497 max_incomplete_time_ms); | 504 max_incomplete_time_ms); |
| 498 } | 505 } |
| 499 | 506 |
| 500 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { | 507 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { |
| 501 return _receiver.SetMinReceiverDelay(desired_delay_ms); | 508 return _receiver.SetMinReceiverDelay(desired_delay_ms); |
| 502 } | 509 } |
| 503 | 510 |
| 504 } // namespace vcm | 511 } // namespace vcm |
| 505 } // namespace webrtc | 512 } // namespace webrtc |
| OLD | NEW |