Merge pull request #536 from red5pro/bug/safari_rtcstats_RED5DEV-1029

fix for stats on safari.
red5pro · Oct 25, 2023 · 86cdc1e · 86cdc1e
2 parents 4cd9310 + 6ab5ce8
commit 86cdc1e
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/static/script/red5pro-utils.js b/static/script/red5pro-utils.js
@@ -68,7 +68,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
           ) {
             bytes = report.bytesSent
             packets = report.packetsSent
-            if (report.mediaType === 'video' || report.id.match(vRegex)) {
+            if (
+              report.mediaType === 'video' ||
+              report.kind === 'video' ||
+              report.id.match(vRegex)
+            ) {
               if (lastResult && lastResult.get(report.id)) {
                 // calculate bitrate
                 bitrate =
@@ -89,7 +93,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             packets = report.packetsReceived
             if (
               ticket.audioOnly &&
-              (report.mediaType === 'audio' || report.id.match(aRegex))
+              (report.mediaType === 'audio' ||
+                report.kind === 'audio' ||
+                report.id.match(aRegex))
             ) {
               if (lastResult && lastResult.get(report.id)) {
                 // calculate bitrate
@@ -100,7 +106,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
               }
             } else if (
               !ticket.audioOnly &&
-              (report.mediaType === 'video' || report.id.match(vRegex))
+              (report.mediaType === 'video' ||
+                report.kind === 'video' ||
+                report.id.match(vRegex))
             ) {
               if (lastResult && lastResult.get(report.id)) {
                 // calculate bitrate
@@ -116,7 +124,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                 }
               }
             }
-          } else if (resolutionCb && report.type === 'track') {
+          } else if (
+            resolutionCb &&
+            (report.type === 'track' || report.kind === 'video')
+          ) {
             var fw = 0
             var fh = 0
             if (