diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html
index 98b347a24d717a3a6b7f8cba9883a73ec54bb140..1b8982431ab463e8d7e6866b02486611a692ef99 100644
--- a/sdk/demo/demo.html
+++ b/sdk/demo/demo.html
@@ -386,11 +386,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
auto_rotate: true,
libPath: commonLibPath, // 配置库文件地址
decoder_type: 'H264', // H265\H264
- microPhoneOutputType: 'OPUS', // PCM或OPUS
- media_config: {
- bitrate: 3000000, // [100000, 1000000]
- fps: 10 // [10, 60] 10的整数倍
- }
+ microPhoneOutputType: 'OPUS' // PCM或OPUS
};
try {
diff --git a/sdk/index.html b/sdk/index.html
index f4dbd34c6cdce44c4fc6b1899f00f1bfbe03e201..2a9220559e039175fe4f1e69861facc3b756efb6 100644
--- a/sdk/index.html
+++ b/sdk/index.html
@@ -386,11 +386,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
auto_rotate: true,
libPath: commonLibPath, // 配置库文件地址
decoder_type: 'H264', // H265\H264
- microPhoneOutputType: 'OPUS', // PCM或OPUS
- media_config: {
- bitrate: 3000000, // [100000, 1000000]
- fps: 10 // [10, 60] 10的整数倍
- }
+ microPhoneOutputType: 'OPUS' // PCM或OPUS
};
try {
if (CloudApp.isSupport()) {
diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 0778512fb3631cc9d4bf9c2e872b0efcd92b5c25..e5ea93a6737c621969d124db4d5595a34d8130fc 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -677,8 +677,6 @@ class AppController {
this.isMSE = this.isMSEMode(this.recMediaConfig.frame_type);
this.initPlyerAndStart();
this.updateResolution();
- // 按照参数设置清晰度
- this.setResolution(DEFAULT_DEFINITION);
// 进入全屏模式
this.triggerFullscreen();
@@ -939,7 +937,8 @@ class AppController {
client_type: '3',
media_config: {
...this.options.mediaConfig,
- frame_type: FRAME_TYPE_MAP.TYPE265
+ frame_type: FRAME_TYPE_MAP.TYPE265,
+ quality: PROTOCOL_CONFIG[DEFAULT_DEFINITION].quality
}
};
// ios/android接入,切到home后有可能会停止发送心跳,该场景下切home超时不生效,切home超时由断连超时决定。
@@ -1193,17 +1192,12 @@ class AppController {
// 设置画质
setResolution(clarityVal) {
- if (this.recMediaConfig) {
- const mediaWidth = this.recMediaConfig.width;
- const frameType = this.recMediaConfig.frame_type.toUpperCase();
- const allMediaConfig = PROTOCOL_CONFIG[frameType];
- const config = allMediaConfig[`${mediaWidth}P`][clarityVal];
- if (this.startParams.media_config && this.startParams.media_config.bitrate) {
- config.bitrate = this.startParams.media_config.bitrate;
- }
-
- this.setMediaConfig(config);
+ const config = PROTOCOL_CONFIG[clarityVal];
+ if (this.startParams.media_config && this.startParams.media_config.bitrate) {
+ config.bitrate = this.startParams.media_config.bitrate;
}
+
+ this.setMediaConfig(config);
}
// 设置音视频参数
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index 0b537b89f3438509b610949e373dddcabd356025..c0780a980bf07e2a99bc0e6445ddcdfba30def6a 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -127,77 +127,14 @@ const PROTOCOL_CONFIG = {
height: 1920
}
},
- H264: {
- '720P': {
- 'UHD': {
- virtual_width: 720,
- virtual_height: 1280,
- bitrate: 2000000
- },
- 'HD': {
- virtual_width: 720,
- virtual_height: 1280,
- bitrate: 1500000
- },
- 'SD': {
- virtual_width: 544,
- virtual_height: 960,
- bitrate: 1100000
- },
- },
- '1280P': {
- 'UHD': {
- virtual_width: 1080,
- virtual_height: 1920,
- bitrate: 4000000
- },
- 'HD': {
- virtual_width: 1080,
- virtual_height: 1920,
- bitrate: 3000000
- },
- 'SD': {
- virtual_width: 720,
- virtual_height: 1280,
- bitrate: 2200000
- },
- },
+ 'UHD': {
+ quality: 'best'
},
- H265: {
- '720P': {
- 'UHD': {
- virtual_width: 720,
- virtual_height: 1280,
- bitrate: 1400000
- },
- 'HD': {
- virtual_width: 720,
- virtual_height: 1280,
- bitrate: 1000000
- },
- 'SD': {
- virtual_width: 544,
- virtual_height: 960,
- bitrate: 800000
- },
- },
- '1280P': {
- 'UHD': {
- virtual_width: 1080,
- virtual_height: 1920,
- bitrate: 2700000
- },
- 'HD': {
- virtual_width: 1080,
- virtual_height: 1920,
- bitrate: 2000000
- },
- 'SD': {
- virtual_width: 720,
- virtual_height: 1280,
- bitrate: 1500000
- },
- },
+ 'HD': {
+ quality: 'main'
+ },
+ 'SD': {
+ quality: 'basic'
},
DEFAULT_RESOLUTION: {
width: 720,