OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
687 framerate_sent(0), | 687 framerate_sent(0), |
688 nominal_bitrate(0), | 688 nominal_bitrate(0), |
689 preferred_bitrate(0), | 689 preferred_bitrate(0), |
690 adapt_reason(0), | 690 adapt_reason(0), |
691 adapt_changes(0), | 691 adapt_changes(0), |
692 avg_encode_ms(0), | 692 avg_encode_ms(0), |
693 encode_usage_percent(0), | 693 encode_usage_percent(0), |
694 frames_encoded(0) {} | 694 frames_encoded(0) {} |
695 | 695 |
696 std::vector<SsrcGroup> ssrc_groups; | 696 std::vector<SsrcGroup> ssrc_groups; |
| 697 // TODO(hbos): Move this to |VideoMediaInfo::send_codecs|? |
697 std::string encoder_implementation_name; | 698 std::string encoder_implementation_name; |
| 699 // TODO(hbos): Move this to |MediaSenderInfo| when supported by |
| 700 // |VoiceSenderInfo| as well (which also extends that class). |
| 701 rtc::Optional<uint32_t> codec_payload_type; |
698 int packets_cached; | 702 int packets_cached; |
699 int firs_rcvd; | 703 int firs_rcvd; |
700 int plis_rcvd; | 704 int plis_rcvd; |
701 int nacks_rcvd; | 705 int nacks_rcvd; |
702 int send_frame_width; | 706 int send_frame_width; |
703 int send_frame_height; | 707 int send_frame_height; |
704 int framerate_input; | 708 int framerate_input; |
705 int framerate_sent; | 709 int framerate_sent; |
706 int nominal_bitrate; | 710 int nominal_bitrate; |
707 int preferred_bitrate; | 711 int preferred_bitrate; |
(...skipping 23 matching lines...) Expand all Loading... |
731 max_decode_ms(0), | 735 max_decode_ms(0), |
732 jitter_buffer_ms(0), | 736 jitter_buffer_ms(0), |
733 min_playout_delay_ms(0), | 737 min_playout_delay_ms(0), |
734 render_delay_ms(0), | 738 render_delay_ms(0), |
735 target_delay_ms(0), | 739 target_delay_ms(0), |
736 current_delay_ms(0), | 740 current_delay_ms(0), |
737 capture_start_ntp_time_ms(-1) { | 741 capture_start_ntp_time_ms(-1) { |
738 } | 742 } |
739 | 743 |
740 std::vector<SsrcGroup> ssrc_groups; | 744 std::vector<SsrcGroup> ssrc_groups; |
| 745 // TODO(hbos): Move this to |VideoMediaInfo::receive_codecs|? |
741 std::string decoder_implementation_name; | 746 std::string decoder_implementation_name; |
| 747 // TODO(hbos): Move this to |MediaReceiverInfo| when supported by |
| 748 // |VoiceReceiverInfo| as well (which also extends that class). |
| 749 rtc::Optional<uint32_t> codec_payload_type; |
742 int packets_concealed; | 750 int packets_concealed; |
743 int firs_sent; | 751 int firs_sent; |
744 int plis_sent; | 752 int plis_sent; |
745 int nacks_sent; | 753 int nacks_sent; |
746 int frame_width; | 754 int frame_width; |
747 int frame_height; | 755 int frame_height; |
748 int framerate_rcvd; | 756 int framerate_rcvd; |
749 int framerate_decoded; | 757 int framerate_decoded; |
750 int framerate_output; | 758 int framerate_output; |
751 // Framerate as sent to the renderer. | 759 // Framerate as sent to the renderer. |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
807 | 815 |
808 int available_send_bandwidth; | 816 int available_send_bandwidth; |
809 int available_recv_bandwidth; | 817 int available_recv_bandwidth; |
810 int target_enc_bitrate; | 818 int target_enc_bitrate; |
811 int actual_enc_bitrate; | 819 int actual_enc_bitrate; |
812 int retransmit_bitrate; | 820 int retransmit_bitrate; |
813 int transmit_bitrate; | 821 int transmit_bitrate; |
814 int64_t bucket_delay; | 822 int64_t bucket_delay; |
815 }; | 823 }; |
816 | 824 |
| 825 // Maps from payload type to |RtpCodecParameters|. |
| 826 typedef std::map<int, webrtc::RtpCodecParameters> RtpCodecParametersMap; |
| 827 |
817 struct VoiceMediaInfo { | 828 struct VoiceMediaInfo { |
818 void Clear() { | 829 void Clear() { |
819 senders.clear(); | 830 senders.clear(); |
820 receivers.clear(); | 831 receivers.clear(); |
821 } | 832 } |
822 std::vector<VoiceSenderInfo> senders; | 833 std::vector<VoiceSenderInfo> senders; |
823 std::vector<VoiceReceiverInfo> receivers; | 834 std::vector<VoiceReceiverInfo> receivers; |
824 }; | 835 }; |
825 | 836 |
826 struct VideoMediaInfo { | 837 struct VideoMediaInfo { |
827 void Clear() { | 838 void Clear() { |
828 senders.clear(); | 839 senders.clear(); |
829 receivers.clear(); | 840 receivers.clear(); |
830 bw_estimations.clear(); | 841 bw_estimations.clear(); |
| 842 send_codecs.clear(); |
| 843 receive_codecs.clear(); |
831 } | 844 } |
832 std::vector<VideoSenderInfo> senders; | 845 std::vector<VideoSenderInfo> senders; |
833 std::vector<VideoReceiverInfo> receivers; | 846 std::vector<VideoReceiverInfo> receivers; |
834 std::vector<BandwidthEstimationInfo> bw_estimations; | 847 std::vector<BandwidthEstimationInfo> bw_estimations; |
| 848 RtpCodecParametersMap send_codecs; |
| 849 RtpCodecParametersMap receive_codecs; |
835 }; | 850 }; |
836 | 851 |
837 struct DataMediaInfo { | 852 struct DataMediaInfo { |
838 void Clear() { | 853 void Clear() { |
839 senders.clear(); | 854 senders.clear(); |
840 receivers.clear(); | 855 receivers.clear(); |
841 } | 856 } |
842 std::vector<DataSenderInfo> senders; | 857 std::vector<DataSenderInfo> senders; |
843 std::vector<DataReceiverInfo> receivers; | 858 std::vector<DataReceiverInfo> receivers; |
844 }; | 859 }; |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1161 // Signal when the media channel is ready to send the stream. Arguments are: | 1176 // Signal when the media channel is ready to send the stream. Arguments are: |
1162 // writable(bool) | 1177 // writable(bool) |
1163 sigslot::signal1<bool> SignalReadyToSend; | 1178 sigslot::signal1<bool> SignalReadyToSend; |
1164 // Signal for notifying that the remote side has closed the DataChannel. | 1179 // Signal for notifying that the remote side has closed the DataChannel. |
1165 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; | 1180 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; |
1166 }; | 1181 }; |
1167 | 1182 |
1168 } // namespace cricket | 1183 } // namespace cricket |
1169 | 1184 |
1170 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 1185 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |
OLD | NEW |