Merge branch 'integration' into 1111-implement-heuristics-to-identify…

…-a-SRT-stream
ebu · Dec 27, 2021 · 6994beb · 6994beb
2 parents 55dab69 + fcd9422
commit 6994beb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/apps/gui-v2/packages/react-app/src/components/SidebarStreamsList/SidebarStreamsList.tsx b/apps/gui-v2/packages/react-app/src/components/SidebarStreamsList/SidebarStreamsList.tsx
@@ -10,6 +10,7 @@ interface IComponentProps {
 }
 
 function SidebarStreamsList({ streamsList, onItemClicked, activeStreamId, onBackButtonClick }: IComponentProps) {
+    console.log(streamsList);
     return (
         <div className="sidebar-helper-container">
             <div className="sidebar-helper-title" onClick={onBackButtonClick}>
@@ -38,7 +39,7 @@ function SidebarStreamsList({ streamsList, onItemClicked, activeStreamId, onBack
                             item.id === activeStreamId ? 'sidebar-helper-protocol-active' : 'sidebar-helper-protocol'
                         }
                     >
-                        <span>{item.protocol}</span>
+                        <span>{item.protocol + ' - ' + item.transport_type}</span>
                     </div>
                 </div>
             ))}
@@ -52,6 +53,7 @@ export interface ISidebarItem {
     type: string;
     fullType: string;
     protocol: string;
+    transport_type: string;
 }
 
 export default SidebarStreamsList;
diff --git a/...2/packages/react-app/src/pages/PCapDetails/InformationSidebar/NetworkInformationPanel.tsx b/...2/packages/react-app/src/pages/PCapDetails/InformationSidebar/NetworkInformationPanel.tsx
@@ -63,6 +63,10 @@ const getNetworkInformationList = (
             title: 'DSCP',
             value: currentStream?.network_information.dscp.value.toString(),
         },
+        {
+            title: "Retransmitted Packets",
+            value: currentStream?.statistics.retransmitted_packets
+        }
     ];
 };
 

diff --git a/apps/gui-v2/packages/react-app/src/pages/PCapDetails/PCapDetailsContentHOC.tsx b/apps/gui-v2/packages/react-app/src/pages/PCapDetails/PCapDetailsContentHOC.tsx
@@ -67,6 +67,7 @@ interface IStreamsList {
     type: string;
     fullType: string;
     protocol: string;
+    transport_type: string;
 }
 
 const getKey = (key: number): string => (key + 1).toString().padStart(2, '0');
@@ -131,6 +132,7 @@ const getStreamsToSidebarStreamsList = (streams: SDK.types.IStreamInfo[]): IStre
             type: item.media_type === 'ancillary_data' ? 'Ancillary' : item.media_type,
             fullType: fullMediaType,
             protocol: 'ST2110',
+            transport_type: item.full_transport_type
         });
     });
 

diff --git a/cpp/libs/preprocessor/lib/src/ebu/list/preprocessor/stream_listener.cpp b/cpp/libs/preprocessor/lib/src/ebu/list/preprocessor/stream_listener.cpp
@@ -127,6 +127,10 @@ void stream_listener::on_complete()
         stream_id_.full_type = media::full_media_from_string("unknown");
         stream_id_.full_transport_type = media::full_transport_type_from_string("unknown");
 
+        if(seqnum_analyzer_.retransmitted_packets() > 0){
+            stream_id_.full_transport_type = media::full_transport_type_from_string("RIST");
+        }
+
         stream_id_.state = stream_state::NEEDS_INFO;
     }
     else if(std::holds_alternative<std::string>(maybe_full_media_type))
@@ -135,9 +139,7 @@ void stream_listener::on_complete()
         stream_id_.full_type = media::full_media_from_string(full_media_type);
         stream_id_.full_transport_type = media::full_transport_type_from_string("RTP");
 
-        if(seqnum_analyzer_.retransmitted_packets() > 0){
-            stream_id_.full_transport_type = media::full_transport_type_from_string("RIST");
-        }
+
 
         if(media::is_full_media_type_video_jxsv(media::full_media_from_string(full_media_type)))
         {