From 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 09 十一月 2020 19:38:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 web_src/src/components/gb28181/devicePlayer.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index b8e45ba..780d03e 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/gb28181/devicePlayer.vue
@@ -223,15 +223,15 @@
         play: function (streamInfo, hasAudio) {
             this.hasaudio = hasAudio;
             // 鏍规嵁濯掍綋娴佷俊鎭簩娆″垽鏂�
+            var realHasAudio = false;
             if (!!streamInfo.tracks && streamInfo.tracks.length > 0 && hasAudio) {
-                var realHasAudio = false;
                 for (let i = 0; i < streamInfo.tracks.length; i++) {
                     if (streamInfo.tracks[i].codec_type == 1 && streamInfo.tracks[i].codec_id_name == "CodecAAC") { // 鍒ゆ柇涓篈AC闊抽
                         realHasAudio = true;
                     }
                 }
-                this.hasaudio = realHasAudio && this.hasaudio;
             }
+            this.hasaudio = realHasAudio && this.hasaudio;
             this.ssrc = streamInfo.ssrc;
             // this.$refs.videoPlayer.hasaudio = hasAudio;
             // this.videoUrl = streamInfo.flv + "?" + new Date().getTime();

--
Gitblit v1.8.0