Merge remote-tracking branch 'origin/main' into moq-native-debug-features

Author: kixelated

Cargo.lock

@@ -24,3 +24,9 @@ web-async = { version = "0.1.1", features = ["tracing"] }
 web-transport-quinn = "0.10"
 web-transport-trait = "0.3"
 web-transport-ws = "0.2"
+
+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"

Cargo.toml

@@ -159,24 +159,30 @@ pub-hls name relay="http://localhost:4443/anon":
 	rm -rf "$OUT_DIR"
 	mkdir -p "$OUT_DIR"
 
-	echo ">>> Generating HLS stream to disk..."
+	echo ">>> Generating HLS stream to disk (1280x720 + 256x144)..."
 
 	# Start ffmpeg in the background to generate HLS
-	ffmpeg -loglevel warning -re -stream_loop -1 -i "$INPUT" \
-		-map 0:v:0 -map 0:v:0 -map 0:a:0 \
+	ffmpeg -hide_banner -loglevel warning -re -stream_loop -1 -i "$INPUT" \
+		-filter_complex "\
+		[0:v]split=2[v0][v1]; \
+		[v0]scale=-2:720[v720]; \
+		[v1]scale=-2:144[v144]" \
+		-map "[v720]" -map "[v144]" -map 0:a:0 \
 		-r 25 -preset veryfast -g 50 -keyint_min 50 -sc_threshold 0 \
-		-c:v:0 libx264 -profile:v:0 high -level:v:0 4.1 -pix_fmt:v:0 yuv420p -tag:v:0 avc1 -bsf:v:0 dump_extra -b:v:0 4M -vf:0 "scale=1920:-2" \
-		-c:v:1 libx264 -profile:v:1 high -level:v:1 4.1 -pix_fmt:v:1 yuv420p -tag:v:1 avc1 -bsf:v:1 dump_extra -b:v:1 300k -vf:1 "scale=256:-2" \
+		-c:v:0 libx264 -profile:v:0 high -level:v:0 4.1 -pix_fmt:v:0 yuv420p -tag:v:0 avc1 \
+		-b:v:0 4M -maxrate:v:0 4.4M -bufsize:v:0 8M \
+		-c:v:1 libx264 -profile:v:1 high -level:v:1 4.1 -pix_fmt:v:1 yuv420p -tag:v:1 avc1 \
+		-b:v:1 300k -maxrate:v:1 330k -bufsize:v:1 600k \
 		-c:a aac -b:a 128k \
-		-f hls \
-		-hls_time 2 -hls_list_size 12 \
+		-f hls -hls_time 2 -hls_list_size 12 \
 		-hls_flags independent_segments+delete_segments \
 		-hls_segment_type fmp4 \
 		-master_pl_name master.m3u8 \
-		-var_stream_map "v:0,agroup:audio v:1,agroup:audio a:0,agroup:audio" \
+		-var_stream_map "v:0,agroup:audio,name:720 v:1,agroup:audio,name:144 a:0,agroup:audio,name:audio" \
 		-hls_segment_filename "$OUT_DIR/v%v/segment_%09d.m4s" \
 		"$OUT_DIR/v%v/stream.m3u8" &
 
+
 	FFMPEG_PID=$!
 
 	# Wait for master playlist to be generated

deno.lock

@@ -19,11 +19,14 @@ path = "src/main.rs"
 [dependencies]
 anyhow = { version = "1", features = ["backtrace"] }
 axum = { version = "0.8", features = ["tokio"] }
+axum-server = { version = "0.8", features = ["tls-rustls"] }
 bytes = "1.10"
 clap = { version = "4", features = ["derive"] }
 hang = { workspace = true }
-hyper-serve = { version = "0.6", features = ["tls-rustls"] }
 moq-native = { workspace = true }
+rustls = { version = "0.23", features = [
+	"aws-lc-rs",
+], default-features = false }
 sd-notify = "0.4"
 tokio = { workspace = true, features = ["full"] }
 tower-http = { version = "0.6", features = ["cors", "fs"] }

justfile

@@ -67,6 +67,12 @@ pub enum Command {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+	// TODO: It would be nice to remove this and rely on feature flags only.
+	// However, some dependency is pulling in `ring` and I don't know why, so meh for now.
+	rustls::crypto::aws_lc_rs::default_provider()
+		.install_default()
+		.expect("failed to install default crypto provider");
+
 	let cli = Cli::parse();
 	cli.log.init();
 

rs/hang-cli/Cargo.toml

@@ -126,7 +126,7 @@ async fn web(
 		app = app.fallback_service(handle_404.into_service());
 	}
 
-	let server = hyper_serve::bind(bind);
+	let server = axum_server::bind(bind);
 	server.serve(app.into_make_service()).await?;
 
 	Ok(())

rs/hang-cli/src/main.rs

@@ -48,8 +48,9 @@ file(MAKE_DIRECTORY ${RUST_TARGET_DIR}/include)
 add_library(moq INTERFACE)
 target_include_directories(moq INTERFACE ${RUST_TARGET_DIR}/include)
 
-# Force absolute path to be used in linker command
-target_link_options(moq INTERFACE "$<LINK_ONLY:${RUST_LIB}>")
+# Link the static library - must use target_link_libraries so it appears
+# after object files in the link command (linker order matters for static libs)
+target_link_libraries(moq INTERFACE "${RUST_LIB}")
 
 # Link required system frameworks on macOS
 if(APPLE)

rs/hang-cli/src/server.rs

@@ -8,28 +8,23 @@ license = "MIT OR Apache-2.0"
 version = "0.10.1"
 edition = "2021"
 
-[package.metadata.cargo-shear]
-ignored = ["hyper", "hyper-util"]
-
 keywords = ["quic", "http3", "webtransport", "media", "live"]
 categories = ["multimedia", "network-programming", "web-programming"]
 
 [dependencies]
-
 anyhow = { version = "1", features = ["backtrace"] }
 axum = { version = "0.8", features = ["tokio", "ws"] }
+axum-server = { version = "0.8", features = ["tls-rustls"] }
 bytes = "1"
 clap = { version = "4", features = ["derive"] }
 futures = "0.3"
 http-body = "1"
-hyper = "=1.7.0"
-hyper-serve = { version = "0.6", features = [
-	"tls-rustls",
-] } # fork of axum-server
-hyper-util = "=0.1.17"
 moq-lite = { workspace = true, features = ["serde"] }
-moq-native = { workspace = true }
+moq-native = { workspace = true, features = ["aws-lc-rs"] }
 moq-token = { workspace = true }
+rustls = { version = "0.23", features = [
+	"aws-lc-rs",
+], default-features = false }
 sd-notify = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_with = { version = "3", features = ["json", "base64"] }

rs/libmoq/CMakeLists.txt

@@ -12,6 +12,12 @@ pub use web::*;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+	// TODO: It would be nice to remove this and rely on feature flags only.
+	// However, some dependency is pulling in `ring` and I don't know why, so meh for now.
+	rustls::crypto::aws_lc_rs::default_provider()
+		.install_default()
+		.expect("failed to install default crypto provider");
+
 	let config = Config::load()?;
 
 	let addr = config.server.bind.unwrap_or("[::]:443".parse().unwrap());