Skip to content

Commit 45d6754

Browse files
Rémi Lauzierlu-zero
Rémi Lauzier
authored andcommitted
Replace some deprecated call
1 parent e09f555 commit 45d6754

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

src/api/channel/by_gop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ impl Config {
327327

328328
// TODO: make it user-settable
329329
let input_len = self.enc.rdo_lookahead_frames as usize * 4;
330-
let frame_limit = std::i32::MAX as u64;
330+
let frame_limit = i32::MAX as u64;
331331

332332
let (send_frame, receive_frame) = bounded(input_len);
333333
let (send_packet, receive_packet) = unbounded();

src/api/channel/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ impl Config {
258258
frame_limit,
259259
)
260260
} else {
261-
(None, None, std::i32::MAX as u64)
261+
(None, None, i32::MAX as u64)
262262
};
263263

264264
let config = Arc::new(self.enc);

src/api/test.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -1367,9 +1367,9 @@ fn output_frameno_no_scene_change_at_short_flash(flash_at: u64) {
13671367
let limit = 5;
13681368
for i in 0..limit {
13691369
if i == flash_at {
1370-
send_test_frame(&mut ctx, u8::min_value());
1370+
send_test_frame(&mut ctx, u8::MIN);
13711371
} else {
1372-
send_test_frame(&mut ctx, u8::max_value());
1372+
send_test_frame(&mut ctx, u8::MAX);
13731373
}
13741374
}
13751375
ctx.flush();
@@ -1419,14 +1419,14 @@ fn output_frameno_no_scene_change_at_flash_smaller_than_max_len_flash() {
14191419
assert_eq!(ctx.inner.inter_cfg.pyramid_depth, 2);
14201420
assert_eq!(ctx.inner.inter_cfg.group_input_len, 4);
14211421

1422-
send_test_frame(&mut ctx, u8::min_value());
1423-
send_test_frame(&mut ctx, u8::min_value());
1424-
send_test_frame(&mut ctx, u8::max_value());
1425-
send_test_frame(&mut ctx, u8::max_value());
1426-
send_test_frame(&mut ctx, u8::max_value());
1427-
send_test_frame(&mut ctx, u8::max_value());
1428-
send_test_frame(&mut ctx, u8::min_value());
1429-
send_test_frame(&mut ctx, u8::min_value());
1422+
send_test_frame(&mut ctx, u8::MIN);
1423+
send_test_frame(&mut ctx, u8::MIN);
1424+
send_test_frame(&mut ctx, u8::MAX);
1425+
send_test_frame(&mut ctx, u8::MAX);
1426+
send_test_frame(&mut ctx, u8::MAX);
1427+
send_test_frame(&mut ctx, u8::MAX);
1428+
send_test_frame(&mut ctx, u8::MIN);
1429+
send_test_frame(&mut ctx, u8::MIN);
14301430
ctx.flush();
14311431

14321432
let data = get_frame_invariants(ctx)
@@ -1479,18 +1479,18 @@ fn output_frameno_scene_change_before_flash_longer_than_max_flash_len() {
14791479
assert_eq!(ctx.inner.inter_cfg.pyramid_depth, 2);
14801480
assert_eq!(ctx.inner.inter_cfg.group_input_len, 4);
14811481

1482-
send_test_frame(&mut ctx, u8::min_value());
1483-
send_test_frame(&mut ctx, u8::min_value());
1484-
send_test_frame(&mut ctx, u8::max_value());
1485-
send_test_frame(&mut ctx, u8::max_value());
1486-
send_test_frame(&mut ctx, u8::max_value());
1487-
send_test_frame(&mut ctx, u8::max_value());
1488-
send_test_frame(&mut ctx, u8::max_value());
1489-
send_test_frame(&mut ctx, u8::min_value());
1490-
send_test_frame(&mut ctx, u8::min_value());
1491-
send_test_frame(&mut ctx, u8::min_value());
1492-
send_test_frame(&mut ctx, u8::min_value());
1493-
send_test_frame(&mut ctx, u8::min_value());
1482+
send_test_frame(&mut ctx, u8::MIN);
1483+
send_test_frame(&mut ctx, u8::MIN);
1484+
send_test_frame(&mut ctx, u8::MAX);
1485+
send_test_frame(&mut ctx, u8::MAX);
1486+
send_test_frame(&mut ctx, u8::MAX);
1487+
send_test_frame(&mut ctx, u8::MAX);
1488+
send_test_frame(&mut ctx, u8::MAX);
1489+
send_test_frame(&mut ctx, u8::MIN);
1490+
send_test_frame(&mut ctx, u8::MIN);
1491+
send_test_frame(&mut ctx, u8::MIN);
1492+
send_test_frame(&mut ctx, u8::MIN);
1493+
send_test_frame(&mut ctx, u8::MIN);
14941494
ctx.flush();
14951495

14961496
let data = get_frame_invariants(ctx)
@@ -1545,8 +1545,8 @@ fn output_frameno_scene_change_after_multiple_flashes() {
15451545
assert_eq!(ctx.inner.inter_cfg.pyramid_depth, 2);
15461546
assert_eq!(ctx.inner.inter_cfg.group_input_len, 4);
15471547

1548-
send_test_frame(&mut ctx, u8::min_value());
1549-
send_test_frame(&mut ctx, u8::min_value());
1548+
send_test_frame(&mut ctx, u8::MIN);
1549+
send_test_frame(&mut ctx, u8::MIN);
15501550
send_test_frame(&mut ctx, 40);
15511551
send_test_frame(&mut ctx, 100);
15521552
send_test_frame(&mut ctx, 160);

src/asm/x86/quantize.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ mod test {
192192
let mut rcoeffs = Aligned::new([0i16; 32 * 32]);
193193

194194
// Generate quantized coefficients up to the eob
195-
let between = Uniform::from(-std::i16::MAX..=std::i16::MAX);
195+
let between = Uniform::from(-i16::MAX..=i16::MAX);
196196
for (i, qcoeff) in qcoeffs.data.iter_mut().enumerate().take(eob) {
197197
*qcoeff = between.sample(&mut rng)
198198
/ if i == 0 { dc_quant } else { ac_quant };

src/scenechange/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ fn detect_scale_factor(sequence: &Arc<Sequence>) -> usize {
404404
481..=720 => 4,
405405
721..=1080 => 8,
406406
1081..=1600 => 16,
407-
1601..=std::usize::MAX => 32,
407+
1601..=usize::MAX => 32,
408408
_ => 1,
409409
} as usize;
410410
debug!(

src/tiling/tiler.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ pub mod test {
813813

814814
#[test]
815815
fn tile_log2_overflow() {
816-
assert_eq!(TilingInfo::tile_log2(1, usize::max_value()), None);
816+
assert_eq!(TilingInfo::tile_log2(1, usize::MAX), None);
817817
}
818818

819819
#[test]

0 commit comments

Comments
 (0)