chore: clippy fix

This commit is contained in:
kieran 2024-11-22 17:16:28 +00:00
parent 54bebc5170
commit ae342a1bfa
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
6 changed files with 15 additions and 20 deletions

View File

@ -42,7 +42,7 @@ impl RecorderEgress {
m m
}; };
Ok(Self { Ok(Self {
id: id.clone(), id: *id,
muxer, muxer,
var_map, var_map,
}) })

View File

@ -63,8 +63,7 @@ pub fn spawn_pipeline(
}, },
Err(e) => { Err(e) => {
error!("Failed to create PipelineRunner: {}", e); error!("Failed to create PipelineRunner: {}", e);
return;
} }
}; }
}); });
} }

View File

@ -98,7 +98,7 @@ impl RtmpClient {
} }
let mx = self.session.handle_input(&self.reader_buf[..r])?; let mx = self.session.handle_input(&self.reader_buf[..r])?;
if mx.len() > 0 { if !mx.is_empty() {
self.msg_queue.extend(mx); self.msg_queue.extend(mx);
self.process_msg_queue()?; self.process_msg_queue()?;
} }
@ -187,7 +187,7 @@ impl RtmpClient {
impl Read for RtmpClient { impl Read for RtmpClient {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> { fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
// block this thread until something comes into [media_buf] // block this thread until something comes into [media_buf]
while self.media_buf.len() == 0 { while self.media_buf.is_empty() {
if let Err(e) = self.read_data() { if let Err(e) = self.read_data() {
error!("Error reading data: {}", e); error!("Error reading data: {}", e);
return Ok(0); return Ok(0);
@ -216,7 +216,6 @@ pub async fn listen(out_dir: String, addr: String, overseer: Arc<dyn Overseer>)
.spawn(move || { .spawn(move || {
if let Err(e) = cc.read_until_publish_request(Duration::from_secs(10)) { if let Err(e) = cc.read_until_publish_request(Duration::from_secs(10)) {
error!("{}", e); error!("{}", e);
return;
} else { } else {
let pr = cc.published_stream.as_ref().unwrap(); let pr = cc.published_stream.as_ref().unwrap();
let info = ConnectionInfo { let info = ConnectionInfo {

View File

@ -179,7 +179,7 @@ impl Read for TestPatternSrc {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> { fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
unsafe { unsafe {
while self.reader.occupied_len() < buf.len() { while self.reader.occupied_len() < buf.len() {
self.next_pkt().map_err(|e| std::io::Error::other(e))?; self.next_pkt().map_err(std::io::Error::other)?;
} }
} }
self.reader.read(buf) self.reader.read(buf)

View File

@ -121,15 +121,12 @@ impl HlsVariant {
std::fs::create_dir_all(PathBuf::from(&first_seg).parent().unwrap())?; std::fs::create_dir_all(PathBuf::from(&first_seg).parent().unwrap())?;
let mut opts = HashMap::new(); let mut opts = HashMap::new();
match segment_type { if let SegmentType::FMP4 = segment_type {
SegmentType::FMP4 => {
opts.insert("fflags".to_string(), "-autobsf".to_string()); opts.insert("fflags".to_string(), "-autobsf".to_string());
opts.insert( opts.insert(
"movflags".to_string(), "movflags".to_string(),
"+frag_custom+dash+delay_moov".to_string(), "+frag_custom+dash+delay_moov".to_string(),
); );
}
_ => {}
}; };
let mut mux = unsafe { let mut mux = unsafe {
Muxer::builder() Muxer::builder()
@ -242,7 +239,7 @@ impl HlsVariant {
av_free((*ctx).url as *mut _); av_free((*ctx).url as *mut _);
let next_seg_url = let next_seg_url =
Self::map_segment_path(&*self.out_dir, &self.name, self.idx, self.segment_type); Self::map_segment_path(&self.out_dir, &self.name, self.idx, self.segment_type);
(*ctx).url = cstr!(next_seg_url.as_str()); (*ctx).url = cstr!(next_seg_url.as_str());
let ret = avio_open(&mut (*ctx).pb, (*ctx).url, AVIO_FLAG_WRITE); let ret = avio_open(&mut (*ctx).pb, (*ctx).url, AVIO_FLAG_WRITE);
@ -276,7 +273,7 @@ impl HlsVariant {
idx: prev_seg, idx: prev_seg,
duration, duration,
path: PathBuf::from(Self::map_segment_path( path: PathBuf::from(Self::map_segment_path(
&*self.out_dir, &self.out_dir,
&self.name, &self.name,
prev_seg, prev_seg,
self.segment_type, self.segment_type,
@ -300,7 +297,7 @@ impl HlsVariant {
if self.segments.len() > MAX_SEGMENTS { if self.segments.len() > MAX_SEGMENTS {
let n_drain = self.segments.len() - MAX_SEGMENTS; let n_drain = self.segments.len() - MAX_SEGMENTS;
let seg_dir = PathBuf::from(self.out_dir()); let seg_dir = self.out_dir();
for seg in self.segments.drain(..n_drain) { for seg in self.segments.drain(..n_drain) {
// delete file // delete file
let seg_path = seg_dir.join(seg.filename()); let seg_path = seg_dir.join(seg.filename());

View File

@ -109,7 +109,7 @@ impl PipelineRunner {
for (var, enc) in &mut self.encoders { for (var, enc) in &mut self.encoders {
for mut pkt in enc.encode_frame(ptr::null_mut())? { for mut pkt in enc.encode_frame(ptr::null_mut())? {
for eg in self.egress.iter_mut() { for eg in self.egress.iter_mut() {
eg.process_pkt(pkt, &var)?; eg.process_pkt(pkt, var)?;
} }
av_packet_free(&mut pkt); av_packet_free(&mut pkt);
} }