@@ -54,7 +54,7 @@ constructor(
5454
5555data class VideoEncoding (
5656 val maxBitrate : Int ,
57- val minBitrate : Int ,
57+ val minBitrate : Int? = null ,
5858 val maxFps : Int ,
5959) {
6060 fun toRtpEncoding (
@@ -111,39 +111,39 @@ enum class VideoPreset169(
111111) : VideoPreset {
112112 H90 (
113113 VideoCaptureParameter (160 , 90 , 15 ),
114- VideoEncoding (90_000 , 0 , 15 ),
114+ VideoEncoding (90_000 , maxFps = 15 ),
115115 ),
116116 H180 (
117117 VideoCaptureParameter (320 , 180 , 15 ),
118- VideoEncoding (160_000 , 0 , 15 ),
118+ VideoEncoding (160_000 , maxFps = 15 ),
119119 ),
120120 H216 (
121121 VideoCaptureParameter (384 , 216 , 15 ),
122- VideoEncoding (180_000 , 0 , 15 ),
122+ VideoEncoding (180_000 , maxFps = 15 ),
123123 ),
124124 H360 (
125125 VideoCaptureParameter (640 , 360 , 30 ),
126- VideoEncoding (450_000 , 0 , 30 ),
126+ VideoEncoding (450_000 , maxFps = 30 ),
127127 ),
128128 H540 (
129129 VideoCaptureParameter (960 , 540 , 30 ),
130- VideoEncoding (800_000 , 0 , 30 ),
130+ VideoEncoding (800_000 , maxFps = 30 ),
131131 ),
132132 H720 (
133133 VideoCaptureParameter (1280 , 720 , 30 ),
134- VideoEncoding (1_700_000 , 0 , 30 ),
134+ VideoEncoding (1_700_000 , maxFps = 30 ),
135135 ),
136136 H1080 (
137137 VideoCaptureParameter (1920 , 1080 , 30 ),
138- VideoEncoding (3_000_000 , 0 , 30 ),
138+ VideoEncoding (3_000_000 , maxFps = 30 ),
139139 ),
140140 H1440 (
141141 VideoCaptureParameter (2560 , 1440 , 30 ),
142- VideoEncoding (5_000_000 , 0 , 30 ),
142+ VideoEncoding (5_000_000 , maxFps = 30 ),
143143 ),
144144 H2160 (
145145 VideoCaptureParameter (3840 , 2160 , 30 ),
146- VideoEncoding (8_000_000 , 0 , 30 ),
146+ VideoEncoding (8_000_000 , maxFps = 30 ),
147147 ),
148148}
149149
@@ -156,39 +156,39 @@ enum class VideoPreset43(
156156) : VideoPreset {
157157 H120 (
158158 VideoCaptureParameter (160 , 120 , 15 ),
159- VideoEncoding (70_000 , 0 , 15 ),
159+ VideoEncoding (70_000 , maxFps = 15 ),
160160 ),
161161 H180 (
162162 VideoCaptureParameter (240 , 180 , 15 ),
163- VideoEncoding (125_000 , 0 , 15 ),
163+ VideoEncoding (125_000 , maxFps = 15 ),
164164 ),
165165 H240 (
166166 VideoCaptureParameter (320 , 240 , 15 ),
167- VideoEncoding (140_000 , 0 , 15 ),
167+ VideoEncoding (140_000 , maxFps = 15 ),
168168 ),
169169 H360 (
170170 VideoCaptureParameter (480 , 360 , 30 ),
171- VideoEncoding (330_000 , 0 , 30 ),
171+ VideoEncoding (330_000 , maxFps = 30 ),
172172 ),
173173 H480 (
174174 VideoCaptureParameter (640 , 480 , 30 ),
175- VideoEncoding (500_000 , 0 , 30 ),
175+ VideoEncoding (500_000 , maxFps = 30 ),
176176 ),
177177 H540 (
178178 VideoCaptureParameter (720 , 540 , 30 ),
179- VideoEncoding (600_000 , 0 , 30 ),
179+ VideoEncoding (600_000 , maxFps = 30 ),
180180 ),
181181 H720 (
182182 VideoCaptureParameter (960 , 720 , 30 ),
183- VideoEncoding (1_300_000 , 0 , 30 ),
183+ VideoEncoding (1_300_000 , maxFps = 30 ),
184184 ),
185185 H1080 (
186186 VideoCaptureParameter (1440 , 1080 , 30 ),
187- VideoEncoding (2_300_000 , 0 , 30 ),
187+ VideoEncoding (2_300_000 , maxFps = 30 ),
188188 ),
189189 H1440 (
190190 VideoCaptureParameter (1920 , 1440 , 30 ),
191- VideoEncoding (3_800_000 , 0 , 30 ),
191+ VideoEncoding (3_800_000 , maxFps = 30 ),
192192 ),
193193}
194194
@@ -201,38 +201,38 @@ enum class ScreenSharePresets(
201201) : VideoPreset {
202202 H360_FPS3 (
203203 VideoCaptureParameter (640 , 360 , 3 ),
204- VideoEncoding (200_000 , 0 , 3 ),
204+ VideoEncoding (200_000 , maxFps = 3 ),
205205 ),
206206 H360_FPS15 (
207207 VideoCaptureParameter (640 , 360 , 15 ),
208- VideoEncoding (400_000 , 0 , 15 ),
208+ VideoEncoding (400_000 , maxFps = 15 ),
209209 ),
210210 H720_FPS5 (
211211 VideoCaptureParameter (1280 , 720 , 5 ),
212- VideoEncoding (800_000 , 0 , 5 ),
212+ VideoEncoding (800_000 , maxFps = 5 ),
213213 ),
214214 H720_FPS15 (
215215 VideoCaptureParameter (1280 , 720 , 15 ),
216- VideoEncoding (1_500_000 , 0 , 15 ),
216+ VideoEncoding (1_500_000 , maxFps = 15 ),
217217 ),
218218 H720_FPS30 (
219219 VideoCaptureParameter (1280 , 720 , 30 ),
220- VideoEncoding (2_000_000 , 0 , 30 ),
220+ VideoEncoding (2_000_000 , maxFps = 30 ),
221221 ),
222222 H1080_FPS15 (
223223 VideoCaptureParameter (1920 , 1080 , 15 ),
224- VideoEncoding (2_500_000 , 0 , 15 ),
224+ VideoEncoding (2_500_000 , maxFps = 15 ),
225225 ),
226226 H1080_FPS30 (
227227 VideoCaptureParameter (1920 , 1080 , 30 ),
228- VideoEncoding (5_000_000 , 0 , 30 ),
228+ VideoEncoding (5_000_000 , maxFps = 30 ),
229229 ),
230230
231231 /* *
232232 * Uses the original resolution without resizing.
233233 */
234234 ORIGINAL (
235235 VideoCaptureParameter (0 , 0 , 30 , adaptOutputToDimensions = false ),
236- VideoEncoding (7_000_000 , 0 , 30 ),
236+ VideoEncoding (7_000_000 , maxFps = 30 ),
237237 )
238238}
0 commit comments