OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 2599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2610 } | 2610 } |
2611 | 2611 |
2612 info.decode_ms = stats.decode_ms; | 2612 info.decode_ms = stats.decode_ms; |
2613 info.max_decode_ms = stats.max_decode_ms; | 2613 info.max_decode_ms = stats.max_decode_ms; |
2614 info.current_delay_ms = stats.current_delay_ms; | 2614 info.current_delay_ms = stats.current_delay_ms; |
2615 info.target_delay_ms = stats.target_delay_ms; | 2615 info.target_delay_ms = stats.target_delay_ms; |
2616 info.jitter_buffer_ms = stats.jitter_buffer_ms; | 2616 info.jitter_buffer_ms = stats.jitter_buffer_ms; |
2617 info.min_playout_delay_ms = stats.min_playout_delay_ms; | 2617 info.min_playout_delay_ms = stats.min_playout_delay_ms; |
2618 info.render_delay_ms = stats.render_delay_ms; | 2618 info.render_delay_ms = stats.render_delay_ms; |
2619 | 2619 |
2620 // Find what codec we're currently receiving. | |
2621 for (const webrtc::VideoReceiveStream::Decoder& decoder : config_.decoders) { | |
2622 if (decoder.payload_type == stats.current_payload_type) { | |
2623 info.codec_name = decoder.payload_name; | |
2624 break; | |
2625 } | |
2626 } | |
pthatcher1
2015/08/27 16:50:50
Would be easier to read with a helper method, some
pbos-webrtc
2015/08/28 10:41:19
Done.
| |
2627 | |
2620 info.firs_sent = stats.rtcp_packet_type_counts.fir_packets; | 2628 info.firs_sent = stats.rtcp_packet_type_counts.fir_packets; |
2621 info.plis_sent = stats.rtcp_packet_type_counts.pli_packets; | 2629 info.plis_sent = stats.rtcp_packet_type_counts.pli_packets; |
2622 info.nacks_sent = stats.rtcp_packet_type_counts.nack_packets; | 2630 info.nacks_sent = stats.rtcp_packet_type_counts.nack_packets; |
2623 | 2631 |
2624 return info; | 2632 return info; |
2625 } | 2633 } |
2626 | 2634 |
2627 WebRtcVideoChannel2::VideoCodecSettings::VideoCodecSettings() | 2635 WebRtcVideoChannel2::VideoCodecSettings::VideoCodecSettings() |
2628 : rtx_payload_type(-1) {} | 2636 : rtx_payload_type(-1) {} |
2629 | 2637 |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2732 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2740 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2733 } | 2741 } |
2734 } | 2742 } |
2735 | 2743 |
2736 return video_codecs; | 2744 return video_codecs; |
2737 } | 2745 } |
2738 | 2746 |
2739 } // namespace cricket | 2747 } // namespace cricket |
2740 | 2748 |
2741 #endif // HAVE_WEBRTC_VIDEO | 2749 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |