doloro/simple-instant-stream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fmt all

Browse Source
This commit is contained in:
doloro
2026-08-29 15:15:28 +01:00
parent 98dbb3d36d
commit c4a7e622b7
10 changed files with 99 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/server/src/audio.rs
+2 -2
View File
@@ -1,10 +1,10 @@
use std::error::Error;
use bytes::Bytes;
use rubato::{audioadapter_buffers::direct::InterleavedSlice, Fft, Resampler};
use rubato::{Fft, Resampler, audioadapter_buffers::direct::InterleavedSlice};
use symphonia::core::{
audio::SampleBuffer,
codecs::{CodecParameters, Decoder, DecoderOptions, CODEC_TYPE_AAC},
codecs::{CODEC_TYPE_AAC, CodecParameters, Decoder, DecoderOptions},
formats::Packet,
};
crates/server/src/codec/av1.rs
+28 -13
View File
@@ -50,7 +50,9 @@ impl Av1CodecParser {
let has_size = (header >> 1) & 1 != 0;
i += 1;
if has_extension {
if i >= data.len() { return false; }
if i >= data.len() {
return false;
}
i += 1;
}
if obu_type == 1 {
@@ -61,13 +63,19 @@ impl Av1CodecParser {
let mut size: usize = 0;
let mut shift = 0;
loop {
if i >= data.len() { return false; }
if i >= data.len() {
return false;
}
let b = data[i] as usize;
i += 1;
size |= (b & 0x7F) << shift;
shift += 7;
if b & 0x80 == 0 { break; }
if shift > 32 { return false; }
if b & 0x80 == 0 {
break;
}
if shift > 32 {
return false;
}
}
i += size;
} else {
@@ -78,7 +86,11 @@ impl Av1CodecParser {
false
}
fn obus_for_frame(&mut self, payload: &[u8], rtmp_is_keyframe: bool) -> Option<(Vec<u8>, bool)> {
fn obus_for_frame(
&mut self,
payload: &[u8],
rtmp_is_keyframe: bool,
) -> Option<(Vec<u8>, bool)> {
if payload.is_empty() {
return None;
}
@@ -95,13 +107,12 @@ impl Av1CodecParser {
self.first_coded_frame = false;
if is_keyframe
&& let Some(config) = &self.config_obus {
let mut out = Vec::with_capacity(config.len() + payload.len());
out.extend_from_slice(config);
out.extend_from_slice(payload);
return Some((out, true));
}
if is_keyframe && let Some(config) = &self.config_obus {
let mut out = Vec::with_capacity(config.len() + payload.len());
out.extend_from_slice(config);
out.extend_from_slice(payload);
return Some((out, true));
}
Some((payload.to_vec(), is_keyframe))
}
@@ -129,7 +140,11 @@ impl CodecParser for Av1CodecParser {
// FourCC — enhanced RTMP only defines CTS for hvc1 CodedFrames.
let payload = data.get(5..)?;
let (obus, is_keyframe) = self.obus_for_frame(payload, rtmp_is_keyframe)?;
Some(VideoFrame { data: Bytes::from(obus), is_keyframe, timestamp_ms })
Some(VideoFrame {
data: Bytes::from(obus),
is_keyframe,
timestamp_ms,
})
}
_ => None,
}
crates/server/src/codec/h264.rs
+21 -10
View File
@@ -53,12 +53,20 @@ impl H264CodecParser {
}
let pts_ms = Self::pts_ms(timestamp_ms, &bytes[5..8]);
let data = self.avcc_to_annexb(bytes.get(8..)?, is_keyframe)?;
Some(VideoFrame { data: Bytes::from(data), is_keyframe, timestamp_ms: pts_ms })
Some(VideoFrame {
data: Bytes::from(data),
is_keyframe,
timestamp_ms: pts_ms,
})
}
3 => {
// CodedFramesX: no CTS field, bytes 5+ = AVCC NALUs
let data = self.avcc_to_annexb(bytes.get(5..)?, is_keyframe)?;
Some(VideoFrame { data: Bytes::from(data), is_keyframe, timestamp_ms })
Some(VideoFrame {
data: Bytes::from(data),
is_keyframe,
timestamp_ms,
})
}
_ => None,
}
@@ -77,7 +85,11 @@ impl H264CodecParser {
// PTS = DTS + CTS — see note on CodedFrames above.
let pts_ms = Self::pts_ms(timestamp_ms, &bytes[2..5]);
let data = self.avcc_to_annexb(&bytes[5..], is_keyframe)?;
Some(VideoFrame { data: Bytes::from(data), is_keyframe, timestamp_ms: pts_ms })
Some(VideoFrame {
data: Bytes::from(data),
is_keyframe,
timestamp_ms: pts_ms,
})
}
_ => None,
}
@@ -148,13 +160,12 @@ impl H264CodecParser {
// Prepend SPS+PPS before every keyframe so str0m's packetizer
// can bundle them into a STAP-A alongside the IDR NALU.
if is_keyframe
&& let (Some(sps), Some(pps)) = (&self.sps, &self.pps) {
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(sps);
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(pps);
}
if is_keyframe && let (Some(sps), Some(pps)) = (&self.sps, &self.pps) {
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(sps);
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(pps);
}
// Convert each length-prefixed NALU to an Annex B start-code NALU.
let mut i = 0;
crates/server/src/codec/h265.rs
+19 -11
View File
@@ -74,15 +74,15 @@ impl H265CodecParser {
fn hvcc_to_annexb(&self, payload: &[u8], is_keyframe: bool) -> Option<Vec<u8>> {
let mut out = Vec::with_capacity(payload.len());
if is_keyframe
&& let (Some(vps), Some(sps), Some(pps)) = (&self.vps, &self.sps, &self.pps) {
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(vps);
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(sps);
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(pps);
}
if is_keyframe && let (Some(vps), Some(sps), Some(pps)) = (&self.vps, &self.sps, &self.pps)
{
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(vps);
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(sps);
out.extend_from_slice(&[0, 0, 0, 1]);
out.extend_from_slice(pps);
}
let mut i = 0;
while i + 4 <= payload.len() {
@@ -128,12 +128,20 @@ impl CodecParser for H265CodecParser {
let cts = i32::from_be_bytes([0, data[5], data[6], data[7]]) << 8 >> 8;
let pts_ms = (timestamp_ms as i64 + cts as i64).max(0) as u32;
let annexb = self.hvcc_to_annexb(data.get(8..)?, is_keyframe)?;
Some(VideoFrame { data: Bytes::from(annexb), is_keyframe, timestamp_ms: pts_ms })
Some(VideoFrame {
data: Bytes::from(annexb),
is_keyframe,
timestamp_ms: pts_ms,
})
}
3 => {
// CodedFramesX: no CTS, bytes 5+ = HVCC
let annexb = self.hvcc_to_annexb(data.get(5..)?, is_keyframe)?;
Some(VideoFrame { data: Bytes::from(annexb), is_keyframe, timestamp_ms })
Some(VideoFrame {
data: Bytes::from(annexb),
is_keyframe,
timestamp_ms,
})
}
_ => None,
}
crates/server/src/http.rs
+3 -1
View File
@@ -13,7 +13,9 @@ use axum_extra::extract::{CookieJar, cookie::Cookie};
/// dashes and apostrophes — no spaces. Mirrors the frontend
/// `/^[A-Za-z0-9'-]{0,67}$/` used by the keys-page popups.
fn valid_charset(s: &str) -> bool {
s.len() <= 67 && s.chars().all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '\'')
s.len() <= 67
&& s.chars()
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '\'')
}
use axum::{
crates/server/src/http_error.rs
+1 -1
View File
@@ -42,7 +42,7 @@ impl HttpError {
Self::BadRequest(_) => StatusCode::BAD_REQUEST,
Self::Unprocessable(_) => StatusCode::UNPROCESSABLE_ENTITY,
Self::NotAcceptable(_) => StatusCode::NOT_ACCEPTABLE,
Self::WhepCodecError(_) => StatusCode::UNSUPPORTED_MEDIA_TYPE,
Self::WhepCodecError(_) => StatusCode::UNSUPPORTED_MEDIA_TYPE,
}
}
}
crates/server/src/main.rs
+1 -4
View File
@@ -16,10 +16,7 @@ use tracing_subscriber::EnvFilter;
use uuid::Uuid;
use crate::{
audio::OpusAudioFrame,
codec::VideoFrame,
http::HttpServer,
webrtc_proxy::WebrtcProxy,
audio::OpusAudioFrame, codec::VideoFrame, http::HttpServer, webrtc_proxy::WebrtcProxy,
};
const SERVER_VERSION: &str = env!("CARGO_PKG_VERSION");
crates/server/src/webrtc_ingest.rs
+7 -1
View File
@@ -71,7 +71,13 @@ pub async fn handle_whip_injest_delete(
state.appstate.lock().await.stream_sessions.remove(&key.id);
// Drop the trickle channel too, so PATCHes to a deleted session 404 and
// the lingering detach task's own cleanup can't reach a newer session.
state.appstate.lock().await.webrtc_proxy.trickle_tx.remove(&key.id);
state
.appstate
.lock()
.await
.webrtc_proxy
.trickle_tx
.remove(&key.id);
Ok(StatusCode::OK)
}
crates/server/src/webrtc_proxy.rs
+16 -12
View File
@@ -34,10 +34,10 @@ impl WebrtcProxy {
let sock = UdpSocket::bind(format!("0.0.0.0:{}", proxy_port)).await?;
let port = sock.local_addr()?.port();
let public_ip = match env::var("PUBLIC_DOMAIN")
.ok()
.filter(|s| !s.trim().is_empty())
{
let public_ip = match env::var("PUBLIC_DOMAIN")
.ok()
.filter(|s| !s.trim().is_empty())
{
Some(domain) => {
let ip = resolve_domain(&domain).await?;
info!(%domain, %ip, "resolved PUBLIC_DOMAIN for WebRTC candidates");
@@ -51,12 +51,14 @@ impl WebrtcProxy {
// IP_UNICAST_IF), which makes checks to 127.0.0.1 vanish.
match default_iface_ipv4() {
Some(ip) => {
info!(%ip, "using default interface IP for WebRTC candidates (debug build)");
ip
info!(%ip, "using default interface IP for WebRTC candidates (debug build)");
ip
}
None => {
warn!("no non-loopback IPv4 interface found, falling back to 127.0.0.1");
IpAddr::from([127, 0, 0, 1])
warn!(
"no non-loopback IPv4 interface found, falling back to 127.0.0.1"
);
IpAddr::from([127, 0, 0, 1])
}
}
} else {
@@ -200,9 +202,9 @@ fn stun_attributes(data: &[u8]) -> impl Iterator<Item = (u16, &[u8])> {
/// connect() only does a route lookup (no packets sent), so the kernel binds
/// the source address the OS would use for outbound traffic.
fn default_iface_ipv4() -> Option<IpAddr> {
let sock = std::net::UdpSocket::bind("0.0.0.0:0").ok()?;
sock.connect("8.8.8.8:9").ok()?;
sock.local_addr().ok().map(|a| a.ip())
let sock = std::net::UdpSocket::bind("0.0.0.0:0").ok()?;
sock.connect("8.8.8.8:9").ok()?;
sock.local_addr().ok().map(|a| a.ip())
}
async fn resolve_domain(domain: &str) -> Result<std::net::IpAddr, Box<dyn Error>> {
@@ -254,7 +256,9 @@ fn parse_xor_mapped_address(data: &[u8]) -> Option<std::net::IpAddr> {
// byte 0: reserved, byte 1: family (0x01=IPv4, 0x02=IPv6)
if value[1] == 0x01 {
let x_addr = u32::from_be_bytes(value[4..8].try_into().ok()?);
Some(std::net::IpAddr::V4(std::net::Ipv4Addr::from(x_addr ^ magic)))
Some(std::net::IpAddr::V4(std::net::Ipv4Addr::from(
x_addr ^ magic,
)))
} else {
None
}
crates/server/tests/whip_sdp_probe.rs
+1 -1
View File
@@ -3,7 +3,7 @@
//! whether the string-fixups in webrtc_ingest.rs actually match.
use std::{net::SocketAddr, time::Instant};
use str0m::{change::SdpOffer, net::Protocol, Candidate, Rtc};
use str0m::{Candidate, Rtc, change::SdpOffer, net::Protocol};
fn obs_like_offer() -> String {
let mut s = String::new();