Auto merge of #268 - troy/rtmp, r=<dry>

rtmp cleanup some work towards cleaning up the rtmp implementation CLOUD-32 Requested-by: TroyKomodo <[email protected]>
ScuffleCloud · Feb 11, 2025 · 864d28f · 864d28f
2 parents 5f136ca + 3e3b195
commit 864d28f
Show file tree

Hide file tree

Showing 52 changed files with 1,953 additions and 1,961 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -69,7 +69,17 @@ scuffle-mp4 = { path = "crates/mp4", version = "0.1.0" }
 scuffle-rtmp = { path = "crates/rtmp", version = "0.1.0" }
 scuffle-transmuxer = { path = "crates/transmuxer", version = "0.1.0" }
 scuffle-workspace-hack = { version = "0.1.0" }
+scuffle-rtmp = { path = "crates/rtmp", version = "0.0.1" }
 
+<<<<<<< HEAD
+=======
+# To be renamed:
+# scuffle-h264 = { path = "crates/h264", version = "0.0.1" }
+# scuffle-h265 = { path = "crates/h265", version = "0.0.1" }
+# scuffle-mp4 = { path = "crates/mp4", version = "0.0.1" }
+# scuffle-transmuxer = { path = "crates/transmuxer", version = "0.0.1" }
+
+>>>>>>> 15a467c (rtmp impl)
 [profile.release-debug]
 inherits = "release"
 debug = true

diff --git a/codecov.yml b/codecov.yml
@@ -103,10 +103,10 @@ component_management:
       name: scuffle-pprof
       paths:
         - crates/pprof/**
-    # - component_id: scuffle-rtmp
-    #   name: scuffle-rtmp
-    #   paths:
-    #     - crates/rtmp/**
+    - component_id: scuffle-rtmp
+      name: scuffle-rtmp
+      paths:
+        - crates/rtmp/**
     - component_id: scuffle-settings
       name: scuffle-settings
       paths:

diff --git a/crates/rtmp/Cargo.toml b/crates/rtmp/Cargo.toml
@@ -24,6 +24,7 @@ tokio = { version = "1.36", features = ["io-util", "sync"] }
 futures = "0.3"
 async-trait = "0.1"
 tracing = "0.1"
+thiserror = "2.0"
 
 scuffle-amf0.workspace = true
 scuffle-workspace-hack.workspace = true

diff --git a/crates/rtmp/README.md b/crates/rtmp/README.md
@@ -7,7 +7,7 @@
 
 ---
 
-A crate for handling RTMP server connections.
+A pure Rust implementation of the RTMP protocol.
 
 ## Status
 

diff --git a/crates/rtmp/src/channels/mod.rs b/crates/rtmp/src/channels/mod.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     ---
-    A crate for handling RTMP server connections.
+    A pure Rust implementation of the RTMP protocol.
     ## Status
@@ Expand Down @@