| 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 1962 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1973 | 1973 |
| 1974 if (stream_ == NULL) | 1974 if (stream_ == NULL) |
| 1975 return info; | 1975 return info; |
| 1976 | 1976 |
| 1977 stats = stream_->GetStats(); | 1977 stats = stream_->GetStats(); |
| 1978 | 1978 |
| 1979 info.adapt_changes = old_adapt_changes_; | 1979 info.adapt_changes = old_adapt_changes_; |
| 1980 info.adapt_reason = CoordinatedVideoAdapter::ADAPTREASON_NONE; | 1980 info.adapt_reason = CoordinatedVideoAdapter::ADAPTREASON_NONE; |
| 1981 | 1981 |
| 1982 if (capturer_ != NULL) { | 1982 if (capturer_ != NULL) { |
| 1983 if (!capturer_->IsMuted()) { | 1983 VideoFormat last_captured_frame_format; |
| 1984 VideoFormat last_captured_frame_format; | 1984 capturer_->GetStats(&info.adapt_frame_drops, &info.effects_frame_drops, |
| 1985 capturer_->GetStats(&info.adapt_frame_drops, &info.effects_frame_drops, | 1985 &info.capturer_frame_time, |
| 1986 &info.capturer_frame_time, | 1986 &last_captured_frame_format); |
| 1987 &last_captured_frame_format); | 1987 info.input_frame_width = last_captured_frame_format.width; |
| 1988 info.input_frame_width = last_captured_frame_format.width; | 1988 info.input_frame_height = last_captured_frame_format.height; |
| 1989 info.input_frame_height = last_captured_frame_format.height; | |
| 1990 } | |
| 1991 if (capturer_->video_adapter() != nullptr) { | 1989 if (capturer_->video_adapter() != nullptr) { |
| 1992 info.adapt_changes += capturer_->video_adapter()->adaptation_changes(); | 1990 info.adapt_changes += capturer_->video_adapter()->adaptation_changes(); |
| 1993 info.adapt_reason = capturer_->video_adapter()->adapt_reason(); | 1991 info.adapt_reason = capturer_->video_adapter()->adapt_reason(); |
| 1994 } | 1992 } |
| 1995 } | 1993 } |
| 1996 } | 1994 } |
| 1997 | 1995 |
| 1998 // Get bandwidth limitation info from stream_->GetStats(). | 1996 // Get bandwidth limitation info from stream_->GetStats(). |
| 1999 // Input resolution (output from video_adapter) can be further scaled down or | 1997 // Input resolution (output from video_adapter) can be further scaled down or |
| 2000 // higher video layer(s) can be dropped due to bitrate constraints. | 1998 // higher video layer(s) can be dropped due to bitrate constraints. |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2504 rtx_mapping[video_codecs[i].codec.id] != | 2502 rtx_mapping[video_codecs[i].codec.id] != |
| 2505 fec_settings.red_payload_type) { | 2503 fec_settings.red_payload_type) { |
| 2506 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2504 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2507 } | 2505 } |
| 2508 } | 2506 } |
| 2509 | 2507 |
| 2510 return video_codecs; | 2508 return video_codecs; |
| 2511 } | 2509 } |
| 2512 | 2510 |
| 2513 } // namespace cricket | 2511 } // namespace cricket |
| OLD | NEW |