| 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 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1660 LOG(LS_VERBOSE) << "Disabling capturer, sending black frame."; | 1660 LOG(LS_VERBOSE) << "Disabling capturer, sending black frame."; |
| 1661 // Force this black frame not to be dropped due to timestamp order | 1661 // Force this black frame not to be dropped due to timestamp order |
| 1662 // check. As IncomingCapturedFrame will drop the frame if this frame's | 1662 // check. As IncomingCapturedFrame will drop the frame if this frame's |
| 1663 // timestamp is less than or equal to last frame's timestamp, it is | 1663 // timestamp is less than or equal to last frame's timestamp, it is |
| 1664 // necessary to give this black frame a larger timestamp than the | 1664 // necessary to give this black frame a larger timestamp than the |
| 1665 // previous one. | 1665 // previous one. |
| 1666 last_frame_timestamp_ms_ += 1; | 1666 last_frame_timestamp_ms_ += 1; |
| 1667 stream_->Input()->IncomingCapturedFrame( | 1667 stream_->Input()->IncomingCapturedFrame( |
| 1668 CreateBlackFrame(last_dimensions_.width, last_dimensions_.height, | 1668 CreateBlackFrame(last_dimensions_.width, last_dimensions_.height, |
| 1669 last_frame_timestamp_ms_, last_rotation_)); | 1669 last_frame_timestamp_ms_, last_rotation_)); |
| 1670 | |
| 1671 | |
| 1672 } | 1670 } |
| 1673 } | 1671 } |
| 1674 } | 1672 } |
| 1675 source_ = source; | 1673 source_ = source; |
| 1676 // |source_->AddOrUpdateSink| may not be called while holding |lock_| since | 1674 // |source_->AddOrUpdateSink| may not be called while holding |lock_| since |
| 1677 // that might cause a lock order inversion. | 1675 // that might cause a lock order inversion. |
| 1678 if (source_) { | 1676 if (source_) { |
| 1679 source_->AddOrUpdateSink(this, sink_wants_); | 1677 source_->AddOrUpdateSink(this, sink_wants_); |
| 1680 } | 1678 } |
| 1681 } | 1679 } |
| (...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2626 rtx_mapping[video_codecs[i].codec.id] != | 2624 rtx_mapping[video_codecs[i].codec.id] != |
| 2627 fec_settings.red_payload_type) { | 2625 fec_settings.red_payload_type) { |
| 2628 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2626 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2629 } | 2627 } |
| 2630 } | 2628 } |
| 2631 | 2629 |
| 2632 return video_codecs; | 2630 return video_codecs; |
| 2633 } | 2631 } |
| 2634 | 2632 |
| 2635 } // namespace cricket | 2633 } // namespace cricket |
| OLD | NEW |