zby-live-sdk 1.0.49-beta1014-1 → 1.0.49-beta1018-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta1014-1",
+  "version": "1.0.49-beta1018-1",
   "main": "dist/zby-live-sdk.cjs.js",
   "module": "dist/zby-live-sdk.esm.js",
   "browsers": "dist/zby-live-sdk.umd.js",

package/src/config/config.js

@@ -13,7 +13,7 @@ const urls = {
 };
 
 // export const version = require('../../package.json').version;
-export const version = '1.0.49-beta1014-1';
+export const version = '1.0.49-beta1018-1';
 
 export const liveExt = {
   name: 'live',

package/src/zby-av-sdk/zby-av-sdk.js

@@ -1832,7 +1832,7 @@ const setThirdAudioCallbackType = (sdkType) => {
   return zegosdk.setThirdAudioType(type);
 };
 
-const startMixStreams = (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds=[], coursewareWidth = 960) => {
+const startMixStreams = (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds=[], coursewareWidth = 1280) => {
   console.log('zego startmixStreams');
   return zegosdk.startmixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds, coursewareWidth);
 };

package/src/zby-av-sdk/zego-sdk.js

@@ -2092,7 +2092,7 @@ export const mixStream = (type, args, seq) => {
  * @param coursewareWidth: Int 课件区真实宽
  * @return Promise | void
  */
-export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId = 0, extraStreamIds=[], coursewareWidth = 960) => {
+export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId = 0, extraStreamIds=[], coursewareWidth = 1280) => {
   let srcStreamInfos = [];
   let bkImage='preset-id://262148633_live_closeCamera.png';
   if (mixType === 0 || mixType === 1) {
@@ -2112,17 +2112,17 @@ export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRt
             streamId: srcStreamIds[i].streamId,
             left: 0,
             top: 0,
-            right: 960,
-            bottom: 540,
+            right: 1280,
+            bottom: 720,
             contentControl: srcStreamIds[i].contentControl
           });
         } else if (i === 1) {
           srcStreamInfos.push({
             streamId: srcStreamIds[i].streamId,
-            left: 1008,
+            left: 1344,
             top: 0,
-            right: 1152,
-            bottom: 108,
+            right: 1536,
+            bottom: 144,
             contentControl: srcStreamIds[i].contentControl
           });
         }    
@@ -2132,7 +2132,7 @@ export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRt
     let srcStreamInfos2 = [];
     Object.assign(srcStreamInfos2, extraStreamIds);
     if(srcStreamInfos2.length > 0) {
-      let factor = 960 / coursewareWidth;
+      let factor = 1280 / coursewareWidth;
       srcStreamInfos2.forEach( item => {
         item.left = parseInt(item.left * factor);
         item.top = parseInt(item.top * factor);
@@ -2173,7 +2173,8 @@ export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRt
     streamInfos: srcStreamInfos,
     rtcStreamId: targetRtcStreamId,
     pushUrls: targetUrls, //数组
-    backgroundImage: bkImage
+    backgroundImage: bkImage,
+    streamOutPut:{width:1600,height:720,videoBitrate:1024000,fps:15}
   };
 
   defaultApi.writeLog(`startMixStreams params:${JSON.stringify(param)}`);

package/src/zby-live-sdk.js

@@ -1530,7 +1530,7 @@ const zbysdk = {
     return zbyAVSDK.sendMediaSideInfo(info);
   },
 
-  startMixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId=0, extraStreamIds=[], coursewareWidth = 960) {
+  startMixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId=0, extraStreamIds=[], coursewareWidth = 1280) {
     defaultApi.writeLog(`sdk action: startMixStreams mixTaskId:${mixTaskId} mixType:${mixType} srcStreamIds:${JSON.stringify(srcStreamIds)} targetRtcStreamId:${targetRtcStreamId} targetUrls:${JSON.stringify(targetUrls)} backgroundImageId:${backgroundImageId} extraStreamIds:${JSON.stringify(extraStreamIds)} coursewareWidth:${coursewareWidth}`);
     return zbyAVSDK.startMixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds, coursewareWidth);
   },