From 69b5bedd07e43da98fbf8dfa03d7573222f06621 Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Sun, 24 Sep 2023 08:05:35 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E6=97=A5=E5=B8=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 taoyao-client-media/src/Taoyao.js          | 21 +++++----
 taoyao-client-web/src/components/Taoyao.js | 51 +++++++++++-----------
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/taoyao-client-media/src/Taoyao.js b/taoyao-client-media/src/Taoyao.js
index bd05941..662d31d 100644
--- a/taoyao-client-media/src/Taoyao.js
+++ b/taoyao-client-media/src/Taoyao.js
@@ -1049,28 +1049,27 @@ class Taoyao {
   /**
    * 修改最佳空间层和时间层信令
    * 
-   * @param {*} message 消息
+   * @param {*} message 信令消息
    * @param {*} body    消息主体
    */
   async mediaConsumerSetPreferredLayers(message, body) {
-    const me = this;
     const {
       roomId,
       consumerId,
       spatialLayer,
       temporalLayer,
     } = body;
-    const room     = me.rooms.get(roomId);
+    const room     = this.rooms.get(roomId);
     const consumer = room?.consumers.get(consumerId);
-    if(consumer) {
-      console.debug("修改最佳空间层和时间层", consumerId);
-      await consumer.setPreferredLayers({
-        spatialLayer,
-        temporalLayer
-      });
-    } else {
-      console.debug("修改最佳空间层和时间层（无效）", consumerId);
+    if(!consumer) {
+      console.debug("修改最佳空间层和时间层（消费者无效）", roomId, consumerId);
+      return;
     }
+    console.debug("修改最佳空间层和时间层", consumerId);
+    await consumer.setPreferredLayers({
+      spatialLayer,
+      temporalLayer
+    });
   }
 
   /**
diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js
index fa0287f..db4c37f 100644
--- a/taoyao-client-web/src/components/Taoyao.js
+++ b/taoyao-client-web/src/components/Taoyao.js
@@ -1651,32 +1651,6 @@ class Taoyao extends RemoteClient {
     console.debug("消费者评分", message);
   }
 
-  /**
-   * 修改最佳空间层和时间层信令
-   * 
-   * @param {*} consumerId    消费者ID
-   * @param {*} spatialLayer  空间层
-   * @param {*} temporalLayer 时间层
-   */
-  mediaConsumerSetPreferredLayers(consumerId, spatialLayer, temporalLayer) {
-    const me = this;
-    const consumer = me.consumers.get(consumerId);
-    if(!consumer) {
-      me.platformError("消费者无效");
-      return;
-    }
-    if(consumer.kind !== "video") {
-      me.platformError("只能修改视频消费者");
-      return;
-    }
-    me.push(protocol.buildMessage("media::consumer::set::preferred::layers", {
-      roomId: me.roomId,
-      consumerId,
-      spatialLayer,
-      temporalLayer,
-    }));
-  }
-
   /**
    * 消费媒体信令
    * 
@@ -1783,6 +1757,31 @@ class Taoyao extends RemoteClient {
     }
   }
 
+  /**
+   * 修改最佳空间层和时间层信令
+   * 
+   * @param {*} consumerId    消费者ID
+   * @param {*} spatialLayer  空间层
+   * @param {*} temporalLayer 时间层
+   */
+  mediaConsumerSetPreferredLayers(consumerId, spatialLayer, temporalLayer) {
+    const consumer = this.consumers.get(consumerId);
+    if(!consumer) {
+      this.platformError("消费者无效");
+      return;
+    }
+    if(consumer.kind !== "video") {
+      this.platformError("只能修改视频消费者");
+      return;
+    }
+    this.push(protocol.buildMessage("media::consumer::set::preferred::layers", {
+      consumerId,
+      spatialLayer,
+      temporalLayer,
+      roomId: this.roomId,
+    }));
+  }
+
   /**
    * 设置消费者优先级信令
    *