zby-live-sdk 1.0.49-beta0825-1 → 1.0.49-beta0921-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta0825-1",
+  "version": "1.0.49-beta0921-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-beta0825-1';
+export const version = '1.0.49-beta0921-1';
 
 export const liveExt = {
   name: 'live',
@@ -108,11 +108,22 @@ const apiChangeSdkUrl = {
   online: 'https://cloud-platform-live.speiyou.com/cloud-platform'
 };
 
+//开启混流
+const apiMixStreams = {
+  test: 'https://tf-classroom-api-test.vdyoo.com',
+  online: 'https://tf-classroom-api-online.vdyoo.com'
+};
+
 export const getApiCloudBaseUrl = () => {
   const {env} = config;
   return apiCloudUrl[env];
 };
 
+export const getApiMixStreams = () => {
+  const {env} = config;
+  return apiMixStreams[env];
+}
+
 export const getApiChangeSdkUrl = () => {
   const {env} = config;
   return apiChangeSdkUrl[env];

package/src/network/api.js

@@ -7,7 +7,7 @@
  * @FilePath: \1705\zby_live_sdk\src\network\api.js
  */
 import commonFetch from './commonFetch.js';
-import {getReportBaseUrl, getApiCloudBaseUrl, getCloudApiDomain, getApiChangeSdkUrl, timestampUrl} from '../config/config.js';
+import {getReportBaseUrl, getApiCloudBaseUrl, getCloudApiDomain, getApiChangeSdkUrl, timestampUrl, getApiMixStreams} from '../config/config.js';
 import util from '../util/util';
 
 //获取信道服务器地址
@@ -48,3 +48,12 @@ export function dabanDataReport(param){
 export function changeSdkInRoom(param){
   return commonFetch(`${getApiChangeSdkUrl()}/rtccloud/sdk/set/lecture/client`, param, 'FROMDATA');
 }
+
+//开始混流
+export function mixStreamsStart(param) {
+  return commonFetch(`${getApiMixStreams()}/rtc-backend/mix/stream/start`, param, 'POST');
+}
+//结束混流
+export function mixStreamsStop(param) {
+  return commonFetch(`${getApiMixStreams()}/rtc-backend/mix/stream/end`, param, 'POST');
+}

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

@@ -83,7 +83,7 @@ export const deviceCheckerInit = async (extension, env) => {
     });
     window.zbyAVSDK_init_sdk_type = 'zego';
   }
-  defaultApi.writeLog('change zbyAVSDK_init_sdk_type to rtc , from avsdk device check init');
+  defaultApi.writeLog('change zbyAVSDK_init_sdk_type to zego , from avsdk device check init');
 };
 
 /**
@@ -1817,6 +1817,16 @@ const setThirdAudioCallbackType = (sdkType) => {
   return zegosdk.setThirdAudioType(type);
 }
 
+const startMixStreams = (urls) => {
+  console.log('zego startmixStreams');
+  return zegosdk.startmixStreams(urls);
+}
+
+const stopMixtStreams = (urls) => {
+  console.log('zego stopMixtStreams');
+  return zegosdk.stopMixtStreams(urls);
+}
+
 
 export default {
   init,
@@ -1896,6 +1906,8 @@ export default {
   enableHighlight,
   setAUXAudioType,
   mixedstuVideo,
-  setThirdAudioCallbackType
+  setThirdAudioCallbackType,
+  startMixStreams,
+  stopMixtStreams
   // getDeviceState
 };

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

@@ -6,6 +6,7 @@
  **/
 import {dabanDataReport} from '../network/api.js';
 import dataReport from '../network/dataReport.js';
+import { mixStreamsStart,mixStreamsStop } from '../network/api';
 import {
   getS,
   setS,
@@ -69,6 +70,9 @@ let currStreamIdRtcPlayerInfo ;
 
 //记录底层推流回调的值
 let dataZegoCapture = {};
+
+//记录推流id
+let streamIdList = [];
 /**
  * @function 调用端提供的回调方法
  * @param name:String 回调方法名
@@ -190,7 +194,10 @@ const addListener = (userId, userName, confId, nNetType, devices) => {
             afterInitSDK(userId, userName, confId, nNetType, devices);
           }
         }
-        break;
+          break;
+        case 'OnMixStreamEx':
+          console.log('OnMixStreamEx',data)
+          break;
       case 'OnLoginChannel':
         var status = JSON.parse(data).uiErrorCode;
         defaultApi.writeLog(`ZEGO::addListener-- OnLoginChannel: ${status}`);
@@ -745,7 +752,7 @@ export const stopCheckDevice = async() => {
   removerListener();
   await stopSoundLevelMonitor();
   await stopPreview();
-  defaultApi.writeLog('rtc stopCheckDevice and removerListener and captureDestroy');
+  defaultApi.writeLog('zego stopCheckDevice and removerListener and captureDestroy');
   return callMethod('DestroyEngine', {});
 };
 
@@ -1791,11 +1798,16 @@ export const setDefaultDevice = async (devices, operationType) => {
  */
 export const startPublish2 = async (streamid, idx, title, flag, seq) => {
   const streamId = streamid || window.zbyAVSDK_init_params.zego.streamId;
+  if (streamIdList.includes(streamId)) {
+    console.log('streamIdList is including this streamid', streamIdList, streamId);
+  } else {
+    streamIdList.push(streamId);
+  }
   if (typeof title === 'undefined') {
     title = 'none';
   }
   if (typeof flag === 'undefined') {
-    flag = 0;
+    flag = 1;
   }
   if (typeof seq === 'undefined') {
     seq = 0;
@@ -2069,6 +2081,133 @@ export const mixStream = (type, args, seq) => {
 
 };
 
+export const startmixStreams = async (targetUrl) => {
+  const zego = window.zbyAVSDK_init_params.zego;
+ 
+  let rtcStreamId = `${zego.sid.slice(0,str.length-1)+2}` //'4000_345_123_2'
+  let param = {
+    institutionId: zego.institutionId,
+    taskId: zego.sid,
+    userId: zego.userId,
+    streamIds: streamIdList,
+    rtcStreamId,
+    pushUrls: targetUrl //数组
+  }
+  let res = await mixStreamsStart(param);
+  if (res.code == 0) {
+    console.log('混流成功:', res);
+  } else {
+    console.log('startmixStream local start……');
+    return callMethod('MixStreamEx', {
+      mixstreamid: zego.sid,
+      config: {
+        nOutputFps: 15,
+        nOutputBitrate: 512000,
+        nOutputAudioBitrate: 48000,
+        nOutputWidth: 1280,
+        nOutputHeight: 720,
+        nOutputAudioConfig: 0,
+        pUserData: '',
+        nLenOfUserData: 0,
+        pInputStreamList: [
+          {
+            szStreamID: streamIdList[1],//截屏窗
+            layout: { left: 0, top: 0, right: 1040, bottom: 720 },
+            uSoundLevelID: 1234,
+            nContentControl: 0,
+            nVolume: 100,
+            bAudioFocus: false,
+            nAudioDirection: -1,
+            renderMode: 0
+          },
+          {
+            szStreamID: streamIdList[0],//头像
+            layout: { left: 1040, top: 0, right: 1280, bottom: 180 },
+            uSoundLevelID: 3232,
+            nContentControl: 0,
+            nVolume: 100,
+            bAudioFocus: false,
+            nAudioDirection: -1,
+            renderMode: 0
+          }
+        ],
+        nInputStreamCount: 2,
+        pOutputList: [
+          {
+            isUrl: true,    // 输出是否为流名或URL
+            target: targetUrl[0], //isUrl=ture完整的RTMP URL，false是流名
+            videoCodec: 0,
+            videoBitrate: 0,
+            encodeProfile: 1,
+            encodeLatency: 0
+          }
+          // {
+          //   isUrl: false,
+          //   target: "streamId",
+          //   videoCodec: 0,
+          //   videoBitrate: 0,
+          //   encodeProfile: 1,
+          //   encodeLatency: 0
+          // }
+        ],
+        nOutputStreamCount: 1,
+        pOutputBackgroundImage: '',
+      }
+    }) 
+  }
+
+ 
+};
+
+export const stopMixtStreams = async (targetUrl) => {
+  const zego = window.zbyAVSDK_init_params.zego;
+  let param = {
+    taskId: zego.sid,
+    userId: zego.userId
+  }
+  let res = await mixStreamsStop(param);
+  if (res.code == 0) {
+    console.log('停止混流成功:', res);
+  } else {
+    return callMethod('MixStreamEx', {
+      mixstreamid: zego.sid,
+      config: {
+        nOutputFps: 15,
+        nOutputBitrate: 512000,
+        nOutputAudioBitrate: 48000,
+        nOutputWidth: 1280,
+        nOutputHeight: 720,
+        nOutputAudioConfig: 0,
+        pUserData: '',
+        nLenOfUserData: 0,
+        pInputStreamList: [],
+        nInputStreamCount: 2,
+        pOutputList: [
+          {
+            isUrl: true,    // 输出是否为流名或URL
+            target: targetUrl[0], //isUrl=ture完整的RTMP URL，false是流名
+            videoCodec: 0,
+            videoBitrate: 0,
+            encodeProfile: 1,
+            encodeLatency: 0
+          }
+          // {
+          //   isUrl: false,
+          //   target: "streamId",
+          //   videoCodec: 0,
+          //   videoBitrate: 0,
+          //   encodeProfile: 1,
+          //   encodeLatency: 0
+          // }
+        ],
+        nOutputStreamCount: 1,
+        pOutputBackgroundImage: '',
+      }
+    }) 
+  }
+};
+
+
 /**
  * @function 是否拉取音频流--通过流id控制
  * @param streamId:String 被拉取的流的 id，必选
@@ -2992,5 +3131,7 @@ export default {
   stopCheckDevice,
   getDeviceCheckInitStatus,
   setDeviceCheckInitStatus,
-  setThirdAudioType
+  setThirdAudioType,
+  startmixStreams,
+  stopMixtStreams
 };

package/src/zby-live-sdk.js

@@ -1520,6 +1520,16 @@ const zbysdk = {
     return zbyAVSDK.sendMediaSideInfo(info);
   },
 
+  startMixStreams(urls) {
+    defaultApi.writeLog('sdk action: startMixStream');
+    return zbyAVSDK.startMixStreams(urls);
+  },
+
+  stopMixtStreams(urls) {
+    defaultApi.writeLog('sdk action: stopMixtStreams');
+    return zbyAVSDK.stopMixtStreams(urls);
+  },
+
   /**
     * @function 切换sdk类型
     * @return: Promise