| OLD | NEW |
| 1 syntax = "proto2"; | 1 syntax = "proto2"; |
| 2 option optimize_for = LITE_RUNTIME; | 2 option optimize_for = LITE_RUNTIME; |
| 3 option java_package = "org.webrtc.AudioNetworkAdaptor"; | 3 option java_package = "org.webrtc.AudioNetworkAdaptor"; |
| 4 option java_outer_classname = "Config"; | 4 option java_outer_classname = "Config"; |
| 5 package webrtc.audio_network_adaptor.config; | 5 package webrtc.audio_network_adaptor.config; |
| 6 | 6 |
| 7 message FecController { | 7 message FecController { |
| 8 message Threshold { | 8 message Threshold { |
| 9 // Threshold defines a curve in the bandwidth/packet-loss domain. The | 9 // Threshold defines a curve in the bandwidth/packet-loss domain. The |
| 10 // curve is characterized by the two conjunction points: A and B. | 10 // curve is characterized by the two conjunction points: A and B. |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 optional int32 fl_20ms_to_60ms_bandwidth_bps = 3; | 85 optional int32 fl_20ms_to_60ms_bandwidth_bps = 3; |
| 86 | 86 |
| 87 // Uplink bandwidth above which frame length should switch from 60ms to 20ms. | 87 // Uplink bandwidth above which frame length should switch from 60ms to 20ms. |
| 88 optional int32 fl_60ms_to_20ms_bandwidth_bps = 4; | 88 optional int32 fl_60ms_to_20ms_bandwidth_bps = 4; |
| 89 | 89 |
| 90 // Uplink bandwidth below which frame length can switch from 60ms to 120ms. | 90 // Uplink bandwidth below which frame length can switch from 60ms to 120ms. |
| 91 optional int32 fl_60ms_to_120ms_bandwidth_bps = 5; | 91 optional int32 fl_60ms_to_120ms_bandwidth_bps = 5; |
| 92 | 92 |
| 93 // Uplink bandwidth above which frame length should switch from 120ms to 60ms. | 93 // Uplink bandwidth above which frame length should switch from 120ms to 60ms. |
| 94 optional int32 fl_120ms_to_60ms_bandwidth_bps = 6; | 94 optional int32 fl_120ms_to_60ms_bandwidth_bps = 6; |
| 95 |
| 96 // Offset to apply to the per-packet overhead when increasing frame length. |
| 97 optional int32 fl_increase_overhead_offset = 7; |
| 98 |
| 99 // Offset to apply to the per-packet overhead when decreasing frame length. |
| 100 optional int32 fl_decrease_overhead_offset = 8; |
| 95 } | 101 } |
| 96 | 102 |
| 97 message ChannelController { | 103 message ChannelController { |
| 98 // Uplink bandwidth above which the number of encoded channels should switch | 104 // Uplink bandwidth above which the number of encoded channels should switch |
| 99 // from 1 to 2. | 105 // from 1 to 2. |
| 100 optional int32 channel_1_to_2_bandwidth_bps = 1; | 106 optional int32 channel_1_to_2_bandwidth_bps = 1; |
| 101 | 107 |
| 102 // Uplink bandwidth below which the number of encoded channels should switch | 108 // Uplink bandwidth below which the number of encoded channels should switch |
| 103 // from 2 to 1. | 109 // from 2 to 1. |
| 104 optional int32 channel_2_to_1_bandwidth_bps = 2; | 110 optional int32 channel_2_to_1_bandwidth_bps = 2; |
| 105 } | 111 } |
| 106 | 112 |
| 107 message DtxController { | 113 message DtxController { |
| 108 // Uplink bandwidth below which DTX should be switched on. | 114 // Uplink bandwidth below which DTX should be switched on. |
| 109 optional int32 dtx_enabling_bandwidth_bps = 1; | 115 optional int32 dtx_enabling_bandwidth_bps = 1; |
| 110 | 116 |
| 111 // Uplink bandwidth above which DTX should be switched off. | 117 // Uplink bandwidth above which DTX should be switched off. |
| 112 optional int32 dtx_disabling_bandwidth_bps = 2; | 118 optional int32 dtx_disabling_bandwidth_bps = 2; |
| 113 } | 119 } |
| 114 | 120 |
| 115 message BitrateController {} | 121 message BitrateController { |
| 122 // Offset to apply to per-packet overhead when the frame length is increased. |
| 123 optional int32 fl_increase_overhead_offset = 1; |
| 124 // Offset to apply to per-packet overhead when the frame length is decreased. |
| 125 optional int32 fl_decrease_overhead_offset = 2; |
| 126 } |
| 116 | 127 |
| 117 message Controller { | 128 message Controller { |
| 118 message ScoringPoint { | 129 message ScoringPoint { |
| 119 // |ScoringPoint| is a subspace of network condition. It is used for | 130 // |ScoringPoint| is a subspace of network condition. It is used for |
| 120 // comparing the significance of controllers. | 131 // comparing the significance of controllers. |
| 121 optional int32 uplink_bandwidth_bps = 1; | 132 optional int32 uplink_bandwidth_bps = 1; |
| 122 optional float uplink_packet_loss_fraction = 2; | 133 optional float uplink_packet_loss_fraction = 2; |
| 123 } | 134 } |
| 124 | 135 |
| 125 // The distance from |scoring_point| to a given network condition defines | 136 // The distance from |scoring_point| to a given network condition defines |
| (...skipping 18 matching lines...) Expand all Loading... |
| 144 repeated Controller controllers = 1; | 155 repeated Controller controllers = 1; |
| 145 | 156 |
| 146 // Least time since last reordering for a new reordering to be made. | 157 // Least time since last reordering for a new reordering to be made. |
| 147 optional int32 min_reordering_time_ms = 2; | 158 optional int32 min_reordering_time_ms = 2; |
| 148 | 159 |
| 149 // Least squared distance from last scoring point for a new reordering to be | 160 // Least squared distance from last scoring point for a new reordering to be |
| 150 // made. | 161 // made. |
| 151 optional float min_reordering_squared_distance = 3; | 162 optional float min_reordering_squared_distance = 3; |
| 152 } | 163 } |
| 153 | 164 |
| OLD | NEW |