mirror of
https://github.com/freemkv/libfreemkv.git
synced 2026-10-07 18:13:10 +00:00
fmt, clippy
This commit is contained in:
+4
-1
@@ -1227,7 +1227,10 @@ mod tests {
|
||||
title.codec_privates = vec![None; 3];
|
||||
let shared = std::sync::Arc::new(std::sync::Mutex::new(Vec::<u8>::new()));
|
||||
let mut stream = M2tsStream::create(SharedSink(shared.clone()), &title).unwrap();
|
||||
assert!(stream.undelivered_streams().is_empty(), "nothing arrived yet");
|
||||
assert!(
|
||||
stream.undelivered_streams().is_empty(),
|
||||
"nothing arrived yet"
|
||||
);
|
||||
stream
|
||||
.write(&frame(0, 0, true, fake_idr_pes_data()))
|
||||
.unwrap();
|
||||
|
||||
+2
-1
@@ -1049,7 +1049,8 @@ mod tests {
|
||||
);
|
||||
let e = m.finish().expect_err("an AU that cannot be packetized");
|
||||
assert!(
|
||||
e.to_string().contains(&crate::error::Error::MpgUnpacketized.to_string()),
|
||||
e.to_string()
|
||||
.contains(&crate::error::Error::MpgUnpacketized.to_string()),
|
||||
"{e}"
|
||||
);
|
||||
}
|
||||
|
||||
+6
-1
@@ -601,7 +601,12 @@ mod probe_tests {
|
||||
];
|
||||
for (i, rate) in want.into_iter().enumerate() {
|
||||
let es = video(720, 576, i as u8 + 1, false);
|
||||
assert_eq!(probe_video(&es, Some(0x02)).unwrap().2, rate, "code {}", i + 1);
|
||||
assert_eq!(
|
||||
probe_video(&es, Some(0x02)).unwrap().2,
|
||||
rate,
|
||||
"code {}",
|
||||
i + 1
|
||||
);
|
||||
}
|
||||
let es = video(720, 576, 0, false);
|
||||
assert_eq!(probe_video(&es, Some(0x02)).unwrap().2, FrameRate::Unknown);
|
||||
|
||||
+15
-4
@@ -2330,7 +2330,10 @@ fn a_timestamp_below_the_origin_is_clamped_and_counted() {
|
||||
let out = sink.mux.take().unwrap().into_writer();
|
||||
let parsed = replay::parse(&out).unwrap();
|
||||
assert!(
|
||||
parsed.pes.iter().any(|x| x.key.0 == 0xC0 && x.pts == Some(0)),
|
||||
parsed
|
||||
.pes
|
||||
.iter()
|
||||
.any(|x| x.key.0 == 0xC0 && x.pts == Some(0)),
|
||||
"the clamped AU is stamped 0"
|
||||
);
|
||||
}
|
||||
@@ -2412,7 +2415,7 @@ fn a_partial_lpcm_unit_at_eof_is_padded_not_lost() {
|
||||
secs: 2,
|
||||
..Opts::default()
|
||||
});
|
||||
let last = fx.frames.iter().filter(|f| f.track == 6).last().unwrap();
|
||||
let last = fx.frames.iter().rfind(|f| f.track == 6).unwrap();
|
||||
// Three stereo 24-bit sample frames: under any packing unit.
|
||||
let tail = PesFrame {
|
||||
pts: last.pts + 10 * MS,
|
||||
@@ -2494,8 +2497,16 @@ fn a_map_pairing_an_extension_with_the_wrong_base_drops_it() {
|
||||
};
|
||||
let e = [
|
||||
entry(0x02, 0xE0, vec![]),
|
||||
entry(0x04, 0xC0, pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 0, 0).to_vec()),
|
||||
entry(0x04, 0xC1, pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 2, 0).to_vec()),
|
||||
entry(
|
||||
0x04,
|
||||
0xC0,
|
||||
pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 0, 0).to_vec(),
|
||||
),
|
||||
entry(
|
||||
0x04,
|
||||
0xC1,
|
||||
pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 2, 0).to_vec(),
|
||||
),
|
||||
// 0xD1 embeds layer 0 (base 0xC0), but the IR pairs 0xD1 only with 0xC1.
|
||||
entry(
|
||||
0x04,
|
||||
|
||||
+3
-1
@@ -761,7 +761,9 @@ mod tests {
|
||||
.meta(&sample_title());
|
||||
writer.write(&one_frame()).unwrap();
|
||||
let linger = |w: &NetworkStream| match &w.mode {
|
||||
Mode::Write { writer, .. } => socket2::SockRef::from(writer.get_ref()).linger().unwrap(),
|
||||
Mode::Write { writer, .. } => {
|
||||
socket2::SockRef::from(writer.get_ref()).linger().unwrap()
|
||||
}
|
||||
Mode::Read { .. } => unreachable!(),
|
||||
};
|
||||
assert_eq!(linger(&writer), None);
|
||||
|
||||
@@ -905,7 +905,10 @@ mod tests {
|
||||
tx.send(DemuxBatch::Ts(vec![ts_pes(0x1011, vec![1])]))
|
||||
.unwrap();
|
||||
tx.send(DemuxBatch::Eof).unwrap();
|
||||
assert!(stream.read().unwrap().is_none(), "the dangling frame is dropped");
|
||||
assert!(
|
||||
stream.read().unwrap().is_none(),
|
||||
"the dangling frame is dropped"
|
||||
);
|
||||
assert_eq!(stream.errors(), 1, "and counted");
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -992,7 +992,9 @@ pub(crate) fn build_keyed_pipeline<S: SectorSource + Send + 'static>(
|
||||
)
|
||||
.map_err(io::Error::from)?;
|
||||
let plan = IsoPlan {
|
||||
extents: set.key_map().read_plan(&full_extents, u32::from(AACS_UNIT_SECTORS)),
|
||||
extents: set
|
||||
.key_map()
|
||||
.read_plan(&full_extents, u32::from(AACS_UNIT_SECTORS)),
|
||||
full_extents,
|
||||
policy,
|
||||
unit_align: AACS_UNIT_SECTORS,
|
||||
|
||||
+10
-2
@@ -197,9 +197,17 @@ mod tests {
|
||||
subtitle: PidFilter::All,
|
||||
};
|
||||
let s = SelectedSource::wrap(Box::new(src), &sel).unwrap();
|
||||
assert_eq!(s.track_timing(0).codec_delay_ns, 20, "inner track 2's timing");
|
||||
assert_eq!(
|
||||
s.track_timing(0).codec_delay_ns,
|
||||
20,
|
||||
"inner track 2's timing"
|
||||
);
|
||||
assert_eq!(s.track_timing(1), TrackTiming::default());
|
||||
assert_eq!(s.config_changes(), vec![(0, 7)], "renumbered, unkept dropped");
|
||||
assert_eq!(
|
||||
s.config_changes(),
|
||||
vec![(0, 7)],
|
||||
"renumbered, unkept dropped"
|
||||
);
|
||||
assert_eq!((s.errors(), s.lost_bytes()), (5, 9));
|
||||
assert!(!s.headers_ready());
|
||||
}
|
||||
|
||||
+2
-1
@@ -1449,7 +1449,8 @@ mod tests {
|
||||
let mut mux = TsMuxer::new(&mut sink, &pids);
|
||||
mux.set_program(types.to_vec()).unwrap();
|
||||
for t in 0..types.len() {
|
||||
mux.write_frame(t, 0, true, &[0xFF, 0xF1, 0x4C, 0x80]).unwrap();
|
||||
mux.write_frame(t, 0, true, &[0xFF, 0xF1, 0x4C, 0x80])
|
||||
.unwrap();
|
||||
}
|
||||
mux.finish().unwrap();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user