| 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 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2082     if (stream_ == NULL) | 2082     if (stream_ == NULL) | 
| 2083       return info; | 2083       return info; | 
| 2084 | 2084 | 
| 2085     stats = stream_->GetStats(); | 2085     stats = stream_->GetStats(); | 
| 2086   } | 2086   } | 
| 2087   info.adapt_changes = number_of_cpu_adapt_changes_; | 2087   info.adapt_changes = number_of_cpu_adapt_changes_; | 
| 2088   info.adapt_reason = cpu_restricted_counter_ <= 0 | 2088   info.adapt_reason = cpu_restricted_counter_ <= 0 | 
| 2089                           ? CoordinatedVideoAdapter::ADAPTREASON_NONE | 2089                           ? CoordinatedVideoAdapter::ADAPTREASON_NONE | 
| 2090                           : CoordinatedVideoAdapter::ADAPTREASON_CPU; | 2090                           : CoordinatedVideoAdapter::ADAPTREASON_CPU; | 
| 2091 | 2091 | 
| 2092   if (capturer_) { |  | 
| 2093       VideoFormat last_captured_frame_format; |  | 
| 2094       capturer_->GetStats(&last_captured_frame_format); |  | 
| 2095       info.input_frame_width = last_captured_frame_format.width; |  | 
| 2096       info.input_frame_height = last_captured_frame_format.height; |  | 
| 2097   } |  | 
| 2098 |  | 
| 2099   // Get bandwidth limitation info from stream_->GetStats(). | 2092   // Get bandwidth limitation info from stream_->GetStats(). | 
| 2100   // Input resolution (output from video_adapter) can be further scaled down or | 2093   // Input resolution (output from video_adapter) can be further scaled down or | 
| 2101   // higher video layer(s) can be dropped due to bitrate constraints. | 2094   // higher video layer(s) can be dropped due to bitrate constraints. | 
| 2102   // Note, adapt_changes only include changes from the video_adapter. | 2095   // Note, adapt_changes only include changes from the video_adapter. | 
| 2103   if (stats.bw_limited_resolution) | 2096   if (stats.bw_limited_resolution) | 
| 2104     info.adapt_reason |= CoordinatedVideoAdapter::ADAPTREASON_BANDWIDTH; | 2097     info.adapt_reason |= CoordinatedVideoAdapter::ADAPTREASON_BANDWIDTH; | 
| 2105 | 2098 | 
| 2106   info.encoder_implementation_name = stats.encoder_implementation_name; | 2099   info.encoder_implementation_name = stats.encoder_implementation_name; | 
| 2107   info.ssrc_groups = ssrc_groups_; | 2100   info.ssrc_groups = ssrc_groups_; | 
| 2108   info.framerate_input = stats.input_frame_rate; | 2101   info.framerate_input = stats.input_frame_rate; | 
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2593         rtx_mapping[video_codecs[i].codec.id] != | 2586         rtx_mapping[video_codecs[i].codec.id] != | 
| 2594             fec_settings.red_payload_type) { | 2587             fec_settings.red_payload_type) { | 
| 2595       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2588       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 
| 2596     } | 2589     } | 
| 2597   } | 2590   } | 
| 2598 | 2591 | 
| 2599   return video_codecs; | 2592   return video_codecs; | 
| 2600 } | 2593 } | 
| 2601 | 2594 | 
| 2602 }  // namespace cricket | 2595 }  // namespace cricket | 
| OLD | NEW | 
|---|