Merge remote-tracking branch 'origin/alphabetic-order' into alphabeti…

…c-order

Cargo.toml

@@ -11,7 +11,7 @@ tokio = { version = "1", features = [ "full" ] }
 tokio-stream = "0.1"
 warp = "0.3"
 futures-util = "0.3"
-pcap = "1.0.0"
+pcap = { version = "1.0.0", features = ["capture-stream"]}
 etherparse = "0.13.0"
 clap = { version = "4", features = ["derive"] }
 

client/src/app.rs

@@ -4,15 +4,15 @@ use eframe::egui;
 use egui::{ComboBox, Ui};
 use ewebsock::{WsEvent, WsMessage, WsReceiver, WsSender};
 use log::{error, warn};
-use rtpeeker_common::{Request, Response, Source};
+use rtpeeker_common::{Request, Response, Source, StreamKey};
 
 use packets_table::PacketsTable;
 use rtcp_packets_table::RtcpPacketsTable;
 use rtp_packets_table::RtpPacketsTable;
 use rtp_streams_table::RtpStreamsTable;
 use tab::Tab;
 
-use crate::streams::{RefStreams, StreamKey};
+use crate::streams::RefStreams;
 use rtp_streams_plot::RtpStreamsPlot;
 
 mod packets_table;
@@ -79,7 +79,7 @@ impl App {
         let packets_table = PacketsTable::new(streams.clone(), ws_sender.clone());
         let rtp_packets_table = RtpPacketsTable::new(streams.clone());
         let rtcp_packets_table = RtcpPacketsTable::new(streams.clone());
-        let rtp_streams_table = RtpStreamsTable::new(streams.clone());
+        let rtp_streams_table = RtpStreamsTable::new(streams.clone(), ws_sender.clone());
         let rtp_streams_plot = RtpStreamsPlot::new(streams.clone());
 
         let (tab, selected_source) = get_initial_state(cc);
@@ -244,7 +244,7 @@ impl App {
             };
 
             let Ok(response) = Response::decode(&msg) else {
-                error!("Failed to decode request message");
+                error!("Failed to decode response message");
                 continue;
             };
 
@@ -263,6 +263,12 @@ impl App {
                     }
                     self.sources = sources;
                 }
+                Response::Sdp(stream_key, sdp) => {
+                    let mut streams = self.streams.borrow_mut();
+                    if let Some(stream) = streams.streams.get_mut(&stream_key) {
+                        stream.add_sdp(sdp);
+                    }
+                }
             }
         }
     }

client/src/app/rtp_packets_table.rs

@@ -1,9 +1,10 @@
 use super::is_stream_visible;
-use crate::streams::{RefStreams, StreamKey};
+use crate::streams::RefStreams;
 use eframe::epaint::Color32;
 use egui::RichText;
 use egui_extras::{Column, TableBody, TableBuilder};
 use rtpeeker_common::packet::SessionPacket;
+use rtpeeker_common::StreamKey;
 use std::collections::HashMap;
 
 pub struct RtpPacketsTable {
@@ -166,17 +167,7 @@ impl RtpPacketsTable {
             resp.on_hover_text(rtp_packet.payload_type.to_string());
 
             row.col(|ui| {
-                // if rtp_packet.previous_packet_is_lost {
-                //     let resp = ui.label(
-                //         RichText::from(format!("{} ⚠", rtp_packet.sequence_number))
-                //             .color(Color32::GOLD),
-                //     );
-                //     resp.on_hover_text(
-                //         RichText::from("Previous packet is lost!").color(Color32::GOLD),
-                //     );
-                // } else {
                 ui.label(rtp_packet.sequence_number.to_string());
-                // }
             });
 
             row.col(|ui| {