Skip to content

Commit 5acd886

Browse files
committed
lint: clippy
1 parent cce68f2 commit 5acd886

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

moqt-ingest-gateway/src/rtmp/connection.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use tokio::{
1212

1313
use super::{
1414
handshake::perform_handshake,
15-
session::{handle_event, RtmpState},
15+
session::{RtmpState, handle_event},
1616
};
1717
use crate::moqt::MoqtManager;
1818

@@ -63,14 +63,7 @@ async fn handle_connection(mut socket: TcpStream, label: &str, moqt: MoqtManager
6363
break;
6464
}
6565

66-
handle_session_bytes(
67-
&mut session,
68-
&mut socket,
69-
&buf[..read],
70-
label,
71-
&mut state,
72-
)
73-
.await?;
66+
handle_session_bytes(&mut session, &mut socket, &buf[..read], label, &mut state).await?;
7467
}
7568

7669
Ok(())

moqt-ingest-gateway/src/rtmp/handshake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use anyhow::{anyhow, Result};
1+
use anyhow::{Result, anyhow};
22
use rml_rtmp::handshake::{Handshake, HandshakeProcessResult, PeerType};
33
use tokio::{
44
io::{AsyncReadExt, AsyncWriteExt},

moqt-ingest-gateway/src/rtmp/session.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,22 +200,29 @@ pub async fn handle_event(
200200
.unwrap_or_default()
201201
.as_millis() as u64;
202202
let codec_key = (namespace_path.clone(), track_name.clone());
203-
let already_sent = state.video_codec_sent.get(&codec_key).copied().unwrap_or(false);
203+
let already_sent = state
204+
.video_codec_sent
205+
.get(&codec_key)
206+
.copied()
207+
.unwrap_or(false);
204208
let include_codec = frame.is_key && !already_sent;
205209
let payload = pack_video_chunk_payload(
206210
frame.is_key,
207211
timestamp_us,
208212
sent_at_ms,
209213
frame.data.as_slice(),
210-
if include_codec { frame.codec.as_deref() } else { None },
214+
if include_codec {
215+
frame.codec.as_deref()
216+
} else {
217+
None
218+
},
211219
None,
212220
);
213221
if frame.is_key && include_codec {
214222
if let Some(codec) = frame.codec.as_deref() {
215223
println!(
216224
"[rtmp {label}] detected video codec from SPS: {codec} ns={:?} track={}",
217-
namespace,
218-
track_name
225+
namespace, track_name
219226
);
220227
state.video_codec_sent.insert(codec_key.clone(), true);
221228
} else {

moqt-ingest-gateway/src/video.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ impl AvcState {
152152
let profile_idc = sps[1];
153153
let constraints = sps[2];
154154
let level_idc = sps[3];
155-
Some(format!("avc1.{profile_idc:02X}{constraints:02X}{level_idc:02X}"))
155+
Some(format!(
156+
"avc1.{profile_idc:02X}{constraints:02X}{level_idc:02X}"
157+
))
156158
}
157159
}

0 commit comments

Comments
 (0)