andrey/retina
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clippy cleanup on client example

Browse Source
This commit is contained in:
Scott Lamb 2022-07-13 11:44:53 -07:00
parent 978d0d7791
commit 3a8f11450f
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
examples/client/src/mp4.rs
View File

@ -80,13 +80,13 @@ pub struct Opts {
macro_rules! write_box { macro_rules! write_box {
($buf:expr, $fourcc:expr, $b:block) => {{ ($buf:expr, $fourcc:expr, $b:block) => {{
let _: &mut BytesMut = $buf; // type-check. let _: &mut BytesMut = $buf; // type-check.
let pos_start = $buf.len(); let pos_start = ($buf as &BytesMut).len();
let fourcc: &[u8; 4] = $fourcc; let fourcc: &[u8; 4] = $fourcc;
$buf.extend_from_slice(&[0, 0, 0, 0, fourcc[0], fourcc[1], fourcc[2], fourcc[3]]); $buf.extend_from_slice(&[0, 0, 0, 0, fourcc[0], fourcc[1], fourcc[2], fourcc[3]]);
let r = { let r = {
$b; $b;
}; };
let pos_end = $buf.len(); let pos_end = ($buf as &BytesMut).len();
let len = pos_end.checked_sub(pos_start).unwrap(); let len = pos_end.checked_sub(pos_start).unwrap();
$buf[pos_start..pos_start + 4].copy_from_slice(&u32::try_from(len)?.to_be_bytes()[..]); $buf[pos_start..pos_start + 4].copy_from_slice(&u32::try_from(len)?.to_be_bytes()[..]);
r r
@ -305,7 +305,7 @@ impl<W: AsyncWrite + AsyncSeek + Send + Unpin> Mp4Writer<W> {
.seek(SeekFrom::Start(u64::from(self.mdat_start - 8))) .seek(SeekFrom::Start(u64::from(self.mdat_start - 8)))
.await?; .await?;
self.inner self.inner
.write_all(&u32::try_from(self.mdat_pos + 8 - self.mdat_start)?.to_be_bytes()[..]) .write_all(&(self.mdat_pos + 8 - self.mdat_start).to_be_bytes()[..])
.await?; .await?;
Ok(()) Ok(())
} }
@ -462,9 +462,9 @@ impl<W: AsyncWrite + AsyncSeek + Send + Unpin> Mp4Writer<W> {
buf.put_u32(0); // version buf.put_u32(0); // version
buf.put_u32(1); // entry_count buf.put_u32(1); // entry_count
buf.extend_from_slice( buf.extend_from_slice(
&parameters parameters
.sample_entry() .sample_entry()
.expect("all added streams have sample entries")[..], .expect("all added streams have sample entries"),
); );
}); });
self.audio_trak.write_common_stbl_parts(buf)?; self.audio_trak.write_common_stbl_parts(buf)?;
@ -580,8 +580,7 @@ impl<W: AsyncWrite + AsyncSeek + Send + Unpin> Mp4Writer<W> {
.checked_add(size) .checked_add(size)
.ok_or_else(|| anyhow!("mdat_pos overflow"))?; .ok_or_else(|| anyhow!("mdat_pos overflow"))?;
if frame.is_random_access_point() { if frame.is_random_access_point() {
self.video_sync_sample_nums self.video_sync_sample_nums.push(self.video_trak.samples);
.push(u32::try_from(self.video_trak.samples)?);
} }
self.inner.write_all(frame.data()).await?; self.inner.write_all(frame.data()).await?;
Ok(()) Ok(())
@ -663,8 +662,8 @@ async fn copy<'a>(
} }
/// Writes the `.mp4`, including trying to finish or clean up the file. /// Writes the `.mp4`, including trying to finish or clean up the file.
async fn write_mp4<'a>( async fn write_mp4(
opts: &'a Opts, opts: &Opts,
session: retina::client::Session<retina::client::Described>, session: retina::client::Session<retina::client::Described>,
audio_params: Option<Box<AudioParameters>>, audio_params: Option<Box<AudioParameters>>,
stop_signal: Pin<Box<dyn Future<Output = Result<(), std::io::Error>>>>, stop_signal: Pin<Box<dyn Future<Output = Result<(), std::io::Error>>>>,
@ -694,11 +693,9 @@ async fn write_mp4<'a>(
if let Err(e) = tokio::fs::remove_file(&tmp_filename).await { if let Err(e) = tokio::fs::remove_file(&tmp_filename).await {
log::error!("and removing .mp4 failed too: {}", e); log::error!("and removing .mp4 failed too: {}", e);
} }
} else { } else if let Err(e) = tokio::fs::rename(&tmp_filename, &opts.out).await {
if let Err(e) = tokio::fs::rename(&tmp_filename, &opts.out).await {
log::error!("unable to move completed .mp4 into place: {}", e); log::error!("unable to move completed .mp4 into place: {}", e);
} }
}
Err(e) Err(e)
} else { } else {
// Directly return errors about finishing. // Directly return errors about finishing.

2
examples/client/src/onvif.rs
View File

@ -62,7 +62,7 @@ async fn run_inner(opts: Opts, session_group: Arc<SessionGroup>) -> Result<(), E
info!( info!(
"{}: {}\n", "{}: {}\n",
&m.timestamp(), &m.timestamp(),
std::str::from_utf8(&m.data()[..]).unwrap(), std::str::from_utf8(m.data()).unwrap(),
); );
}, },
_ => continue, _ => continue,