Cal
/
RTMP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a bug

master
Cal 2024-11-21 16:16:11 +08:00
parent 189e80a6f8
commit 9ff450dcad
2 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/RTMPPublisher.cs
View File

@ -82,7 +82,10 @@ namespace ZC
Bitmap.EncodeToBitmap(textureData, _bitmapArray, 0, textureData.Length, _targetTextureWidth, this._targetTextureHeight); Bitmap.EncodeToBitmap(textureData, _bitmapArray, 0, textureData.Length, _targetTextureWidth, this._targetTextureHeight);
Profiler.EndSample(); Profiler.EndSample();
Profiler.BeginSample("WriteBuffer"); Profiler.BeginSample("WriteBuffer");
_process.StandardInput.BaseStream.Write(_bitmapArray, 0, _bitmapArray.Length); if (!this._process.HasExited)
{
_process.StandardInput.BaseStream.Write(_bitmapArray, 0, _bitmapArray.Length);
}
Profiler.EndSample(); Profiler.EndSample();
_textureDataPool.Enqueue(result); _textureDataPool.Enqueue(result);
_ = _doneFrameIndex + 1 >= uint.MaxValue ? _doneFrameIndex = 0 : _doneFrameIndex++; _ = _doneFrameIndex + 1 >= uint.MaxValue ? _doneFrameIndex = 0 : _doneFrameIndex++;

104
UserSettings/Layouts/default-2022.dwlt
View File

@ -120,7 +120,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 150} m_MinSize: {x: 400, y: 150}
m_MaxSize: {x: 32384, y: 24288} m_MaxSize: {x: 32384, y: 24288}
vertical: 0 vertical: 0
controlID: 149 controlID: 5029
draggingID: 0 draggingID: 0
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
@ -146,7 +146,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 150} m_MinSize: {x: 200, y: 150}
m_MaxSize: {x: 16192, y: 24288} m_MaxSize: {x: 16192, y: 24288}
vertical: 0 vertical: 0
controlID: 26 controlID: 4967
draggingID: 0 draggingID: 0
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
@ -168,12 +168,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1183 width: 1181
height: 1152 height: 1152
m_MinSize: {x: 100, y: 150} m_MinSize: {x: 100, y: 150}
m_MaxSize: {x: 8096, y: 24288} m_MaxSize: {x: 8096, y: 24288}
vertical: 1 vertical: 1
controlID: 27 controlID: 5103
draggingID: 0 draggingID: 0
--- !u!114 &8 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
@ -192,10 +192,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1183 width: 1181
height: 320 height: 320
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 15}
@ -218,10 +218,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 320 y: 320
width: 1183 width: 1181
height: 475 height: 515
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
@ -243,11 +243,11 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 795 y: 835
width: 1183 width: 1181
height: 357 height: 317
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 16}
@ -268,12 +268,12 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1183 x: 1181
y: 0 y: 0
width: 241 width: 243
height: 1152 height: 1152
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 17}
m_Panes: m_Panes:
- {fileID: 17} - {fileID: 17}
@ -324,8 +324,8 @@ MonoBehaviour:
y: 0 y: 0
width: 296 width: 296
height: 1152 height: 1152
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 19} m_ActualView: {fileID: 19}
m_Panes: m_Panes:
- {fileID: 19} - {fileID: 19}
@ -354,8 +354,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 36 x: 36
y: 501 y: 501
width: 1182 width: 1180
height: 454 height: 494
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
@ -408,23 +408,23 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 21 y: 21
width: 1182 width: 1180
height: 433 height: 473
m_Scale: {x: 0.40092593, y: 0.40092593} m_Scale: {x: 0.43796295, y: 0.43796295}
m_Translation: {x: 591, y: 216.5} m_Translation: {x: 590, y: 236.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -1474.0878 x: -1347.1459
y: -540 y: -540
width: 2948.1755 width: 2694.2917
height: 1080 height: 1080
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 0.40092593 m_defaultScale: 0.43796295
m_LastWindowPixelSize: {x: 1182, y: 454} m_LastWindowPixelSize: {x: 1180, y: 494}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
@ -452,7 +452,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 36 x: 36
y: 181 y: 181
width: 1182 width: 1180
height: 299 height: 299
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -481,9 +481,9 @@ MonoBehaviour:
floating: 0 floating: 0
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: -141, y: 149} snapOffset: {x: -141, y: -150}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0}
snapCorner: 1 snapCorner: 3
id: unity-grid-and-snap-toolbar id: unity-grid-and-snap-toolbar
index: 1 index: 1
layout: 1 layout: 1
@ -773,9 +773,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 1825.5619, y: 1029.0568, z: -0.9695983} m_Target: {x: -2062.5068, y: -2211.9612, z: -5546.6426}
speed: 2 speed: 2
m_Value: {x: 1825.5619, y: 1029.0568, z: -0.9695983} m_Value: {x: -2062.5068, y: -2211.9612, z: -5546.6426}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
@ -821,13 +821,13 @@ MonoBehaviour:
m_GridAxis: 1 m_GridAxis: 1
m_gridOpacity: 0.5 m_gridOpacity: 0.5
m_Rotation: m_Rotation:
m_Target: {x: -0.18233694, y: -0.31602854, z: 0.062028006, w: -0.928995} m_Target: {x: -0.11479808, y: -0.7598516, z: 0.13969089, w: -0.62444675}
speed: 2 speed: 2
m_Value: {x: -0.18233694, y: -0.31602854, z: 0.062028006, w: -0.928995} m_Value: {x: -0.11479806, y: -0.75985146, z: 0.13969088, w: -0.6244467}
m_Size: m_Size:
m_Target: 12.124355 m_Target: 1026.5046
speed: 2 speed: 2
m_Value: 12.124355 m_Value: 1026.5046
m_Ortho: m_Ortho:
m_Target: 0 m_Target: 0
speed: 2 speed: 2
@ -873,9 +873,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 36 x: 36
y: 976 y: 1016
width: 1182 width: 1180
height: 336 height: 296
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
@ -906,9 +906,9 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1219 x: 1217
y: 181 y: 181
width: 239 width: 241
height: 1131 height: 1131
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -925,7 +925,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 2cfbffff m_ExpandedIDs: d80fd0ff3010d0ff8a11d0ff20fbffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -1009,9 +1009,9 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 005b0000 m_SelectedIDs: 025b0000
m_LastClickedID: 23296 m_LastClickedID: 23298
m_ExpandedIDs: 00000000005b000000ca9a3b m_ExpandedIDs: 00000000025b000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -1039,7 +1039,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000005b0000 m_ExpandedIDs: 00000000025b000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -1066,7 +1066,7 @@ MonoBehaviour:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000040bf0300 m_ExpandedInstanceIDs: c623000040bf0300
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0