| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * libjingle | 2  * libjingle | 
| 3  * Copyright 2004 Google Inc. | 3  * Copyright 2004 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 843 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 854         framerate_output(0), | 854         framerate_output(0), | 
| 855         framerate_render_input(0), | 855         framerate_render_input(0), | 
| 856         framerate_render_output(0), | 856         framerate_render_output(0), | 
| 857         decode_ms(0), | 857         decode_ms(0), | 
| 858         max_decode_ms(0), | 858         max_decode_ms(0), | 
| 859         jitter_buffer_ms(0), | 859         jitter_buffer_ms(0), | 
| 860         min_playout_delay_ms(0), | 860         min_playout_delay_ms(0), | 
| 861         render_delay_ms(0), | 861         render_delay_ms(0), | 
| 862         target_delay_ms(0), | 862         target_delay_ms(0), | 
| 863         current_delay_ms(0), | 863         current_delay_ms(0), | 
| 864         capture_start_ntp_time_ms(-1) { | 864         capture_start_ntp_time_ms(-1), | 
|  | 865         qp(-1) { | 
| 865   } | 866   } | 
| 866 | 867 | 
| 867   std::vector<SsrcGroup> ssrc_groups; | 868   std::vector<SsrcGroup> ssrc_groups; | 
| 868   int packets_concealed; | 869   int packets_concealed; | 
| 869   int firs_sent; | 870   int firs_sent; | 
| 870   int plis_sent; | 871   int plis_sent; | 
| 871   int nacks_sent; | 872   int nacks_sent; | 
| 872   int frame_width; | 873   int frame_width; | 
| 873   int frame_height; | 874   int frame_height; | 
| 874   int framerate_rcvd; | 875   int framerate_rcvd; | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 894   // Requested latency to account for rendering delay. | 895   // Requested latency to account for rendering delay. | 
| 895   int render_delay_ms; | 896   int render_delay_ms; | 
| 896   // Target overall delay: network+decode+render, accounting for | 897   // Target overall delay: network+decode+render, accounting for | 
| 897   // min_playout_delay_ms. | 898   // min_playout_delay_ms. | 
| 898   int target_delay_ms; | 899   int target_delay_ms; | 
| 899   // Current overall delay, possibly ramping towards target_delay_ms. | 900   // Current overall delay, possibly ramping towards target_delay_ms. | 
| 900   int current_delay_ms; | 901   int current_delay_ms; | 
| 901 | 902 | 
| 902   // Estimated capture start time in NTP time in ms. | 903   // Estimated capture start time in NTP time in ms. | 
| 903   int64_t capture_start_ntp_time_ms; | 904   int64_t capture_start_ntp_time_ms; | 
|  | 905   // Average codec quantizer value. | 
|  | 906   int qp; | 
| 904 }; | 907 }; | 
| 905 | 908 | 
| 906 struct DataSenderInfo : public MediaSenderInfo { | 909 struct DataSenderInfo : public MediaSenderInfo { | 
| 907   DataSenderInfo() | 910   DataSenderInfo() | 
| 908       : ssrc(0) { | 911       : ssrc(0) { | 
| 909   } | 912   } | 
| 910 | 913 | 
| 911   uint32_t ssrc; | 914   uint32_t ssrc; | 
| 912 }; | 915 }; | 
| 913 | 916 | 
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1248   // Signal when the media channel is ready to send the stream. Arguments are: | 1251   // Signal when the media channel is ready to send the stream. Arguments are: | 
| 1249   //     writable(bool) | 1252   //     writable(bool) | 
| 1250   sigslot::signal1<bool> SignalReadyToSend; | 1253   sigslot::signal1<bool> SignalReadyToSend; | 
| 1251   // Signal for notifying that the remote side has closed the DataChannel. | 1254   // Signal for notifying that the remote side has closed the DataChannel. | 
| 1252   sigslot::signal1<uint32_t> SignalStreamClosedRemotely; | 1255   sigslot::signal1<uint32_t> SignalStreamClosedRemotely; | 
| 1253 }; | 1256 }; | 
| 1254 | 1257 | 
| 1255 }  // namespace cricket | 1258 }  // namespace cricket | 
| 1256 | 1259 | 
| 1257 #endif  // TALK_MEDIA_BASE_MEDIACHANNEL_H_ | 1260 #endif  // TALK_MEDIA_BASE_MEDIACHANNEL_H_ | 
| OLD | NEW | 
|---|