zby-live-sdk 1.0.49-beta-talrtc0920 → 1.0.49-beta0921-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta-talrtc0920",
+  "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-beta-talrtc0920';
+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/talrtc-sdk.js

@@ -52,7 +52,6 @@ let localRoomId = null;
 let userId = null;
 let isNoticeMicVolume = false;
 let enableLocalCapture = true; // 本地摄像头采集，默认允许
-let teacherId = null;
 // /**
 //   * 过滤直播云sdk中deviceId前缀
 //   * @param {string} deviceId
@@ -426,13 +425,12 @@ const init = async (args) => {
   localRoomId = args.roomId;
   userId = args.userId;
   localStreamId = args.streamId;
-  teacherId = args.teacherId;
   const _devices = {
     camera: (devices && devices.camera) || (usedDevices && usedDevices.camera && usedDevices.camera.use) || '',
     microphone: (devices && devices.microphone) || (usedDevices && usedDevices.microphone && usedDevices.microphone.use) || '',
     speaker: (devices && devices.speaker) || (usedDevices && usedDevices.speaker && usedDevices.speaker.use) || ''
   };
-  console.log('-> load talrtc sdk. teacherId: ', teacherId);
+  console.log('-> load talrtc sdk');
   await loadTalrtc(args.extensionVersion);
   console.log('-> load talrtc sdk finished ');
   const resp = await startEngine(args.appId, args.userId, args.usersign || '67890', 7, args.live_id);
@@ -456,7 +454,6 @@ const init = async (args) => {
 
       //rtc同屏以及高光时刻,都开启音频外部采集,默认传1
       await setAudioAuxSource(1);
-      teacherId = null;
     }
 
     if(args.noiseSuppressMode == -2) {
@@ -1501,8 +1498,6 @@ const startPush = async (streamId) => {
   if (streamId === screenStreamId) {
     isScreenSharing = true;
   }
-  setAudioType(4, localStreamId); // 设置采集类型，不用await，避免接口挂起导致未推流
-
   defaultApi.writeLog(`avsdk TALSDK::startPush streamId: ${streamId}`);
   try {
     if (!isFirstHeartBeatReport) {
@@ -1597,7 +1592,6 @@ const startPlay = (streamId, muteAudio, muteVideo) => {
   }
   defaultApi.writeLog(`avsdk TALSDK::startPlay streamId: ${streamId}, muteAudio: ${muteAudio}, muteVideo: ${muteVideo}`);
   return callMethod('StartPlay', {
-    myStreamId: localStreamId,
     streamId,
     muteAudio,
     muteVideo,
@@ -1870,19 +1864,10 @@ const setAudioAuxSource = (source) => {
   });
 };
 
-/**
- * RTC流音频类型
- * @param {number} type 音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器 5: 扬声器
- * @param {string} streamId 流
- * @returns {Promise<void>}
- */
-const setAudioType = (type, streamId) => {
-  defaultApi.writeLog('info', 'avsdk TALRTC::SetAudioType');
-  if (!streamId) {
-    streamId = screenStreamId;
-  }
-  return callMethod('SetAudioType', {
-    streamId,
+//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器
+const setAUXAudioType = (type) => {
+  defaultApi.writeLog('info', 'avsdk TALRTC::SetAUXAudioType');
+  return callMethod('SetAUXAudioType', {
     type
   });
 };
@@ -1928,18 +1913,13 @@ const startMultiScreen = async () => {
  * @returns {Promise}
  */
 export const setAudioMixMode = async (mixMode, streamIdArr) => {
-  // let channelsArr = [];
-  // if(streamIdArr.length > 0){
-  //   streamIdArr.forEach( item => {
-  //     channelsArr.push(getChannelIndex(item));
-  //   });
-  // }
-  if (!Array.isArray(streamIdArr)) return;
-
-  if (teacherId && !streamIdArr.includes(teacherId)) {
-    streamIdArr.push(teacherId);
+  let channelsArr = [];
+  if(streamIdArr.length > 0){
+    streamIdArr.forEach( item => {
+      channelsArr.push(getChannelIndex(item));
+    });
   }
-  return callMethod('SetAudioMixMode', {mixMode: mixMode, streamIdArr, num: streamIdArr.length});
+  return callMethod('SetAudioMixMode', {mixMode: mixMode, channels: channelsArr, num: channelsArr.length});
 };
 
 
@@ -1974,10 +1954,6 @@ const leaveRoom = async () => {
   previewIdToStreamId = {};
   streamIdRtcPlayerInfo = {};
   streamIdRtcPlayerInfo1 = {};
-  uiChnIndexs.length = 100;
-  uiChnIndexs.fill(0).forEach((value, index, array) => {
-    array[index] = array.length - (index + 1);
-  });
 };
 
 
@@ -2343,7 +2319,7 @@ export default {
   setMirrorStatus,
   setPlayViewMirror,
   setAudioAuxSource,
-  setAudioType,
+  setAUXAudioType,
   startAudioExCapture,
   startMultiScreen,
   setAudioMixMode,

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

@@ -20,6 +20,11 @@ const rtcReportUrl = {
   test: 'test-r.weclassroom.com',
   online: 'r.weclassroom.com'
 };
+const sdkVale = {
+  zego: 8,    //8代表zego采集麦克风+扬声器
+  talrtc: 101,    //101代表talrtc采集声音
+  trtc: 102,    //102代表trtc采集声音
+}
 
 /**
  * @function 设备检测初始化
@@ -78,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');
 };
 
 /**
@@ -1243,7 +1248,7 @@ export const getSnapshootId = (streamId) => {
     }
     break;
   case TALRTC:
-    if (talrtcsdk.hasStream(streamId)) {
+    if (zegosdk.hasStream(streamId)) {
       return talrtcsdk.getChannelIndex(streamId);
     } else {
       defaultApi.writeLog(`talrtcsdk getSnapshootId , no streamId: ${streamId} in talrtc room`);
@@ -1669,7 +1674,8 @@ export const setAudioMixMode = (mixMode, streamIdArr) => {
   case ZEGO:
     return zegosdk.setAudioMixMode(mixMode, streamIdArr);
   case TALRTC:
-    return talrtcsdk.setAudioMixMode(mixMode, streamIdArr);
+    // FIXME METHOD_NOT_IMPLEMENT;
+    break;
   default:
     break;
   }
@@ -1786,8 +1792,6 @@ export const setAUXAudioType = (type) => {
     break;
   case ZEGO:
     return zegosdk.setAUXAudioType(type);
-  case TALRTC:
-    return talrtcsdk.setAudioType(type);
   default:
     break;
   }
@@ -1808,6 +1812,21 @@ export const getStreamType_zego = () => {
   }
 };
 
+const setThirdAudioCallbackType = (sdkType) => {
+  let type = sdkVale[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,
@@ -1886,6 +1905,9 @@ export default {
   sendMediaSideInfo,
   enableHighlight,
   setAUXAudioType,
-  mixedstuVideo
+  mixedstuVideo,
+  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，必选
@@ -2410,7 +2549,7 @@ const setAudioAuxSource = (source) => {
   });
 }
 
-//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器
+//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器 /5:扬声器(音乐)（没有拉流，没有外部混音没有调用，没有麦克风）
 const setAUXAudioType = (type) => {
   defaultApi.writeLog('info', 'avsdk ZEGO::SetAUXAudioType');
   return callMethod('SetAUXAudioType', {
@@ -2425,6 +2564,14 @@ const startAudioExCapture = (channel) => {
     channel
   });
 }
+/**
+   * @function 设置第三路流音频类型
+   * @param {number} type 音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器(音乐+拉流)(带外部混音) /8:麦克风+扬声器(音乐+拉流)(不带外部混音)/16:扬声器(音乐)（没有拉流，没有外部混音，没有麦克风）
+   * @return: Promise
+  */
+const setThirdAudioType = (type) => {
+  return callMethod('SetThirdAudioType', { type })
+};
 
 //加载截屏插件
 const LoadCollectionOutputEntry2 = () => {
@@ -2983,5 +3130,8 @@ export default {
   addListener,
   stopCheckDevice,
   getDeviceCheckInitStatus,
-  setDeviceCheckInitStatus
+  setDeviceCheckInitStatus,
+  setThirdAudioType,
+  startmixStreams,
+  stopMixtStreams
 };

package/src/zby-live-sdk.js

@@ -198,7 +198,6 @@ function caculateDeatailArgs(baseArgs, cloudData) {
         extensionVersion: baseArgs.extension.version.agora || '1.0.0.0',
         appId: cloudData.appId,
         usersign: 'testsign',
-        teacherId: baseArgs.teacherId
       }),
       trtc: Object.assign({}, commonArgs, liveConfig, {
         extensionVersion: baseArgs.extension.version.trtc || '1.0.0.0',
@@ -384,6 +383,7 @@ const zbysdk = {
     defaultApi.writeLog(`sdk status : setAudioCallbackType , sdk_type : ${sdk_type}`);
     try {
       await liveBaseApi.setAudioCallbackType(sdk_type);
+      await zbyAVSDK.setThirdAudioCallbackType(sdk_type);
     } catch (e) {
       defaultApi.writeLog(`sdk status : setAudioCallbackType , error : ${JSON.stringify(e)}`);
     }; 
@@ -576,7 +576,9 @@ const zbysdk = {
       }
 
       try {
+        console.log('开始设置rtmp声音回调',sdk_type);
         await liveBaseApi.setAudioCallbackType(sdk_type);
+        await zbyAVSDK.setThirdAudioCallbackType(sdk_type);
       } catch (error) {
         defaultApi.writeLog(`setAudioCallbackType error : ${JSON.stringify(error)}`);
       }
@@ -1518,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