Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6295788
redesign MediaStream and mediaStreamTrack to support multiple track.
koseyile Jul 1, 2019
f7310c6
delete member variable videoTrackToRts and AudioTracks from mediaStream.
koseyile Jul 1, 2019
b879c16
Start the name with an uppercase letter.
koseyile Jul 2, 2019
4b296dd
remove the temporary comment code.
koseyile Jul 2, 2019
e924c1d
remove unused comments.
koseyile Jul 2, 2019
2e903d0
add new method "createVideoTrack" to Context class.
koseyile Jul 9, 2019
936991a
video and audio share one mediaStream.
koseyile Jul 9, 2019
c12b797
Merge branch 'multiple_resolution' into multiple_video_capturer
koseyile Jul 9, 2019
f3972bd
change name "videostream" to "mediastream" and add audio track to me…
koseyile Jul 9, 2019
e400b81
decoupling streams and tracks. delete these functions: CaptureVideoSt…
koseyile Jul 11, 2019
7eedfb7
make DummyVideoEncoder support multiple capturer.
koseyile Jul 12, 2019
3e6aa8d
capturers share one nvEncoder.
koseyile Jul 15, 2019
c82dab4
delete parameter label from MediaStream constructor
koseyile Jul 15, 2019
cdf98ea
delete test code.
koseyile Jul 16, 2019
c88c322
changed instance type to build on Yamato
karasusan Jul 21, 2019
0a13fce
remove RTCPeerConnection when the RTCPeerConnection is disconnected.
koseyile Jul 22, 2019
52138b1
add auto testing to check multiple video tracks.
koseyile Jul 22, 2019
09ab522
rename NvVideoCapturer to UnityVideoCapturer
koseyile Jul 22, 2019
5d00ed0
add abstract bass class : UnityEncoder.
koseyile Jul 22, 2019
ed8916a
let DummyVideoEncoderFactory manage the encoder of platform.
koseyile Jul 22, 2019
ec8bbb1
each nvEncoder has a texture buffer.
koseyile Jul 22, 2019
3e248ea
delete comment code.
koseyile Jul 23, 2019
309436b
change pEncoderInterface to no-static.
koseyile Jul 23, 2019
ce51d0f
web app can switch two resolution to show.
koseyile Aug 5, 2019
f56b2ca
same resolution nvEncoders share input texture.
koseyile Aug 12, 2019
c9edf21
add other way to implement simulcast
koseyile Aug 12, 2019
9c85620
add select media stream ui.
koseyile Aug 15, 2019
dd1335e
web app can select media stream.
koseyile Aug 19, 2019
e30e3b4
Merge branch 'dev' of https://github.com/Unity-Technologies/UnityRend…
karasusan Aug 27, 2019
b834318
Update unitypackage
karasusan Aug 28, 2019
cfbc14e
Make a namespace of Audio class clear in Render Streaming class
karasusan Aug 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yamato/upm-ci-renderstreaming-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ publish_{{ package.name }}:
- .yamato/upm-ci-renderstreaming-packages.yml#test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
257 changes: 239 additions & 18 deletions Assets/Scenes/samplescene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 2035111234}
m_IndirectSpecularColor: {r: 5.6792383, g: 8.17355, b: 13.152499, a: 1}
m_IndirectSpecularColor: {r: 6.066754, g: 8.58853, b: 13.636173, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -151,7 +151,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 168218571}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100982}
m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8101001}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 405591765}
Expand Down Expand Up @@ -639,7 +639,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &292819704
GameObject:
Expand Down Expand Up @@ -918,7 +918,7 @@ RectTransform:
- {fileID: 1079513099}
- {fileID: 292819707}
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -1020,7 +1020,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &790650199
GameObject:
Expand Down Expand Up @@ -1062,7 +1062,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: A
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 0}
m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
Expand Down Expand Up @@ -1225,7 +1225,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1020492026
GameObject:
Expand Down Expand Up @@ -1278,7 +1278,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1037846703
GameObject:
Expand Down Expand Up @@ -1310,7 +1310,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1037846703}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870241}
m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870246}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 405591765}
Expand Down Expand Up @@ -1860,7 +1860,9 @@ MonoBehaviour:
username:
streamingSize: {x: 1280, y: 720}
interval: 5
captureCamera: {fileID: 1299133684}
captureCameras:
- {fileID: 1299133684}
- {fileID: 1742567395}
arrayButtonClickEvent:
- elementId: 1
click:
Expand Down Expand Up @@ -1925,7 +1927,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1275443619
PrefabInstance:
Expand Down Expand Up @@ -2170,7 +2172,7 @@ GameObject:
- component: {fileID: 1299133682}
- component: {fileID: 1299133681}
m_Layer: 0
m_Name: Render Streaming Camera
m_Name: Render Streaming Camera 1
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -2409,7 +2411,7 @@ Transform:
- {fileID: 405591765}
- {fileID: 1547029146}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &1547029145
GameObject:
Expand Down Expand Up @@ -2690,8 +2692,227 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1742567391
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1742567396}
- component: {fileID: 1742567395}
- component: {fileID: 1742567394}
- component: {fileID: 1742567393}
- component: {fileID: 1742567392}
m_Layer: 0
m_Name: Render Streaming Camera 2
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1742567392
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1742567391}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
m_Name:
m_EditorClassIdentifier:
clearColorMode: 0
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
clearDepth: 1
volumeLayerMask:
serializedVersion: 2
m_Bits: 4294967295
volumeAnchorOverride: {fileID: 0}
antialiasing: 2
dithering: 1
stopNaNs: 0
physicalParameters:
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
flipYMode: 0
fullscreenPassthrough: 0
customRenderingSettings: 0
invertFaceCulling: 0
probeLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPathCustomFrameSettings:
bitDatas:
data1: 68184748261149
data2: 4539628424389459968
renderingPathCustomFrameSettingsOverrideMask:
mask:
data1: 0
data2: 0
defaultFrameSettings: 0
m_Version: 5
m_ObsoleteRenderingPath: 0
m_ObsoleteFrameSettings:
overrides: 0
enableShadow: 0
enableContactShadows: 0
enableShadowMask: 0
enableSSR: 0
enableSSAO: 0
enableSubsurfaceScattering: 0
enableTransmission: 0
enableAtmosphericScattering: 0
enableVolumetrics: 0
enableReprojectionForVolumetrics: 0
enableLightLayers: 0
enableExposureControl: 1
diffuseGlobalDimmer: 0
specularGlobalDimmer: 0
shaderLitMode: 0
enableDepthPrepassWithDeferredRendering: 0
enableTransparentPrepass: 0
enableMotionVectors: 0
enableObjectMotionVectors: 0
enableDecals: 0
enableRoughRefraction: 0
enableTransparentPostpass: 0
enableDistortion: 0
enablePostprocess: 0
enableOpaqueObjects: 0
enableTransparentObjects: 0
enableRealtimePlanarReflection: 0
enableMSAA: 0
enableAsyncCompute: 0
runLightListAsync: 0
runSSRAsync: 0
runSSAOAsync: 0
runContactShadowsAsync: 0
runVolumeVoxelizationAsync: 0
lightLoopSettings:
overrides: 0
enableDeferredTileAndCluster: 0
enableComputeLightEvaluation: 0
enableComputeLightVariants: 0
enableComputeMaterialVariants: 0
enableFptlForForwardOpaque: 0
enableBigTilePrepass: 0
isFptlEnabled: 0
--- !u!114 &1742567393
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1742567391}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8a636f62116c0a40bbfefdf876d4608, type: 3}
m_Name:
m_EditorClassIdentifier:
m_movementSensitivityFactor: 0.1
boost: 3.5
positionLerpTime: 0.2
mouseSensitivityCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.5
inSlope: 4.6264863
outSlope: 4.6264863
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0.11557238
- serializedVersion: 3
time: 1
value: 2.5
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
rotationLerpTime: 0.01
invertY: 0
--- !u!81 &1742567394
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1742567391}
m_Enabled: 1
--- !u!20 &1742567395
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1742567391}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 2
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 18
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 67.380135
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 1
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1742567396
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1742567391}
m_LocalRotation: {x: -0.07861943, y: 0.8794968, z: -0.15624021, w: -0.44259855}
m_LocalPosition: {x: 5.122, y: 2.016, z: 1.538}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 20.146002, y: 233.427, z: 0.001}
--- !u!1 &1847340766
GameObject:
m_ObjectHideFlags: 19
Expand Down Expand Up @@ -2743,7 +2964,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2011204166
GameObject:
Expand Down Expand Up @@ -2806,7 +3027,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2035111233
GameObject:
Expand Down Expand Up @@ -2899,7 +3120,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 45, y: 130, z: 90}
--- !u!114 &2035111236
MonoBehaviour:
Expand Down Expand Up @@ -3038,7 +3259,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2059789766}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.510098, y: 1.196, z: 1.1760491}
m_LocalPosition: {x: 2.5101, y: 1.196, z: 1.1760501}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 405591765}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Editor/RenderStreamingEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public override void OnInspectorGUI()
ShowIceServerList(serializedObject.FindProperty("iceServers"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("interval"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("streamingSize"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("captureCamera"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("captureCameras"), true);
EditorGUILayout.PropertyField(serializedObject.FindProperty("arrayButtonClickEvent"), true);
serializedObject.ApplyModifiedProperties();
}
Expand Down
Loading