发布TRTC C++ SDK 6.9.0.8315

1. 支持软件/硬件音量设置。
2. 支持BGM是否本地远端音量分开设置。
3. 支持本地录制模块。
4. 支持自定义直播流ID。
5. 支持更纯音频、音视频、音频+画布等更丰富的混流设置。
6. bug/crash fix。
(C# 优化)

Author: kamisBB

Windows/CSharpDemo/TRTCDeviceTestForm.cs

@@ -212,6 +212,16 @@ public void OnTestSpeakerVolume(uint volume)
             }
         }
 
+        public void OnPlayBGMComplete(TXLiteAVError errCode)
+        {
+            this.bgmTestBtn.Text = "启动BGM测试";
+        }
+
+        public void onAudioEffectFinished(int effectId, int code)
+        {
+            this.audioEffectTestBtn.Text = "启动音效测试";
+        }
+
         private void OnExitPicBoxClick(object sender, EventArgs e)
         {
             this.Hide();

Windows/CSharpDemo/TRTCMainForm.cs

@@ -81,8 +81,6 @@ public TRTCMainForm(TRTCLoginForm loginForm)
             InitializeComponent();
 
             this.Disposed += new EventHandler(OnDisposed);
-            // 窗口退出事件监听
-            this.FormClosing += new FormClosingEventHandler(OnExitLabelClick);
 
             // 初始化数据。
             mLoginForm = loginForm;
@@ -150,23 +148,17 @@ private void RemoveCustomVideoView(Control parent, string userId, TRTCVideoStrea
             if (mVideoViews.TryGetValue(key, out videoView))
             {
                 videoView.RemoveEngine(mTRTCCloud);
-                parent.Controls.Remove(videoView);
                 mVideoViews.Remove(key);
+                parent.Controls.Remove(videoView);
             }
         }
 
         private void OnDisposed(object sender, EventArgs e)
         {
             // 清理资源
+            mTRTCCloud.removeCallback(this);
+            mTRTCCloud.setLogCallback(null);
             mTRTCCloud = null;
-            if (mCustomCaptureForm != null)
-                mCustomCaptureForm.Dispose();
-            if (mDeviceForm != null)
-                mDeviceForm.Dispose();
-            if (mDeviceTestForm != null)
-                mDeviceTestForm.Dispose();
-            if (mSettingForm != null)
-                mSettingForm.Dispose();
         }
 
         private void OnFormLoad(object sender, EventArgs e)
@@ -473,7 +465,14 @@ public void onError(TXLiteAVError errCode, string errMsg, IntPtr arg)
         public void onExitRoom(int reason)
         {
             mIsEnterSuccess = false;
+            // 如果进房成功，需要正常退房再关闭窗口，防止资源未清理和释放完毕
+            Uninit();
             this.Close();
+            if (mLoginForm == null)
+            {
+                mLoginForm = new TRTCLoginForm();
+            }
+            mLoginForm.Show();
         }
 
         /// <summary>
@@ -513,8 +512,6 @@ private void Uninit()
             mMixStreamVideoMeta.Clear();
             mRemoteUsers.Clear();
             mPKUsers.Clear();
-            mTRTCCloud.removeCallback(this);
-            mTRTCCloud.setLogCallback(null);
             // 注意：系统混音功能暂时不支持64位系统
             if (!Util.IsSys64bit())
             {
@@ -529,6 +526,7 @@ private void Uninit()
             }
             if (this.mixTransCodingCheckBox.Checked)
                 mTRTCCloud.setMixTranscodingConfig(null);
+            
         }
 
         /// <summary>
@@ -900,8 +898,6 @@ private void SetVisableInfoView(int pos, bool visable)
         private void OnExitLabelClick(object sender, EventArgs e)
         {
             // 退出房间
-            if (mIsFirstExitRoom) return;
-            mIsFirstExitRoom = true;
             if (mBeautyForm != null)
                 mBeautyForm.Close();
             if (mDeviceTestForm != null)
@@ -916,22 +912,14 @@ private void OnExitLabelClick(object sender, EventArgs e)
                 mDeviceTestForm.Close();
             if (mDeviceForm != null)
                 mDeviceForm.Close();
-            Uninit();
-            // 如果进房成功，需要正常退房再关闭窗口，防止资源未清理和释放完毕
             if (mIsEnterSuccess)
             {
                 mTRTCCloud.exitRoom();
-                this.Hide();
             }
             else
             {
-                this.Close();
+                onExitRoom(0);
             }
-            if (mLoginForm == null)
-            {
-                mLoginForm = new TRTCLoginForm();
-            }
-            mLoginForm.Show();
         }
 
         private void OnSettingLabelClick(object sender, EventArgs e)
@@ -1327,11 +1315,11 @@ private void OnShareUrlLabelClick(object sender, EventArgs e)
                 ShowMessage("请勾选云端混流选项！");
                 return;
             }
-            // 计算 CDN 地址(格式： http://[bizid].liveplay.myqcloud.com/live/[bizid]_[streamid].flv )
+            // 计算 CDN 地址(格式： http://[bizid].liveplay.myqcloud.com/live/sdkappid_roomId_userId_main.flv )
             int bizId = GenerateTestUserSig.BIZID;
-            // streamid = MD5 (房间号_用户名_流类型)
-            string streamId = Util.MD5(String.Format("{0}_{1}_{2}", mRoomId, Util.UTF16To8(mUserId), "main"));
-            string shareUrl = String.Format("http://{0}.liveplay.myqcloud.com/live/{0}_{1}.flv", bizId, streamId);
+            // streamid = SDKAPPID_房间号_用户名_流类型
+            string streamId = String.Format("{0}_{1}_{2}_{3}", GenerateTestUserSig.SDKAPPID, mRoomId, Util.UTF16To8(mUserId), "main");
+            string shareUrl = String.Format("http://{0}.liveplay.myqcloud.com/live/{1}.flv", bizId, streamId);
             Log.I("播放地址： " + shareUrl);
             Clipboard.SetDataObject(shareUrl);
             ShowMessage("播放地址：（已复制到剪切板）\n" + shareUrl);
@@ -1763,6 +1751,12 @@ public void onPlayBGMBegin(TXLiteAVError errCode)
         public void onPlayBGMComplete(TXLiteAVError errCode)
         {
             Log.I(String.Format("onPlayBGMComplete : errCode = {0}", errCode));
+            if (this.IsHandleCreated)
+                this.BeginInvoke(new Action(() =>
+                {
+                    if (mDeviceTestForm != null)
+                        mDeviceTestForm.OnPlayBGMComplete(errCode);
+                }));
         }
 
         public void onPlayBGMProgress(uint progressMS, uint durationMS)
@@ -1820,6 +1814,12 @@ public void onSetMixTranscodingConfig(int errCode, string errMsg)
         public void onAudioEffectFinished(int effectId, int code)
         {
             Log.I(String.Format("onAudioEffectFinished : effectId = {0}, code = {1}", effectId, code));
+            if (this.IsHandleCreated)
+                this.BeginInvoke(new Action(() =>
+                {
+                    if (mDeviceTestForm != null)
+                        mDeviceTestForm.onAudioEffectFinished(effectId, code);
+                }));
         }
 
         public void onSpeedTest(TRTCSpeedTestResult currentResult, uint finishedCount, uint totalCount)

Windows/CSharpDemo/TXLiteAVVideoView.cs

@@ -227,15 +227,35 @@ public bool AppendVideoFrame(byte[] data, int width, int height, TRTCVideoPixelF
             }
 
             // 回到主线程刷新当前画面
-            if (this.IsHandleCreated)
+            this.InvokeOnUiThreadIfRequired(new Action(() =>
             {
-                this.Invoke(new Action(() =>
+                this.Refresh();
+            }));
+            return true;
+        }
+
+        private void InvokeOnUiThreadIfRequired(Action action)
+        {
+            try
+            {
+                if (!this.IsDisposed)
                 {
-                    this.Refresh();
-                }));
-                return true;
+                    if (this.InvokeRequired)
+                    {
+                        this.Invoke(action);
+                    }
+                    else
+                    {
+                        action.Invoke();
+                    }
+                }
+                else
+                    System.Threading.Thread.CurrentThread.Abort();
+            }
+            catch (Exception ex)
+            {
+                Log.E(ex.Message);
             }
-            return false;
         }
 
         protected override void OnPaint(PaintEventArgs pe)
@@ -546,8 +566,11 @@ public void onRenderVideoFrame(string userId, TRTCVideoStreamType streamType, TR
                     }
                 }
             }
+
             if (view != null)
+            {
                 view.AppendVideoFrame(frame.data, (int)frame.width, (int)frame.height, frame.videoFormat, frame.rotation);
+            }
         }
     }