Commit Graph

42 Commits

Author SHA1 Message Date
matthew cotton
1363134cbe Merging //UE5/Dev-TensorWorks CLs 18200048 and 18306147 to Release-5.0 (//UE5/Release-5.0)
- Changing the offer/request order
- Adding sfu support
- Adding simulcast support
- Largish structural changes
- adding reference SFU server

#jira UE-136239, UE-136238
#rb aidan.possemiers, luke.bermingham, nick.pace
[FYI] Mattias.Jansson

#ROBOMERGE-AUTHOR: matthew.cotton
#ROBOMERGE-SOURCE: CL 18345619 in //UE5/Release-5.0/... via CL 18345653
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18345683 by matthew cotton in ue5-release-engine-test branch]
2021-12-01 16:57:33 -05:00
nick pace
65bfcfd2e7 Integrate Dev-TensorWorks PixelStreaming/AVEncoder changes into Main
#JIRA UCS-1831
[FYI] luke.bermingham, marco.anastasi
#rb aidan.possemiers

#ROBOMERGE-AUTHOR: nick.pace
#ROBOMERGE-SOURCE: CL 17920208 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v885-17909292)

[CL 17922580 by nick pace in ue5-release-engine-test branch]
2021-10-26 09:13:01 -04:00
christopher waters
6c4b4a91a4 Adding a required StencilRef argument to SetGraphicsPipelineState.
#jira none
#rb zach.bethel, mihnea.balta, florin.pascu
#preflight 61312f4a79ce170001d4a79e

#ROBOMERGE-SOURCE: CL 17422777 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)
#ROBOMERGE[bot1]: emt

[CL 17422941 by christopher waters in ue5-release-engine-test branch]
2021-09-03 12:04:52 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
david harvey
6e7c2a693a remove PLATFORM_XBOXONE from media code.
#jira UECON-543
#rnx
#rb eric.mcdaniel

#ROBOMERGE-OWNER: david.harvey
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 16301679 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v800-16297934)
#ROBOMERGE-CONFLICT from-shelf

[CL 16301713 by david harvey in ue5-release-engine-test branch]
2021-05-12 13:15:22 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
tony wong
5728f81538 GameplayMediaEncoder: Fixed UE4 reference.
#JIRA: UE-111762
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 15856493 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15857265 by tony wong in ue5-main branch]
2021-03-29 20:51:27 -04:00
Steve Robb
4fa411c84e Removal of dependencies to Windows Vista or earlier.
#jira UE-110555
#rb josh.adams

[CL 15746365 by Steve Robb in ue5-main branch]
2021-03-19 08:05:49 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
ethan geller
f37e121920 Audio Device Manager refactor submission take two. haven't added the bIsMutable flag yet but will next week.
[FYI] aaron.mcleran, ryan.mangin, marc.audy, matt.hoffman


#ROBOMERGE-OWNER: ethan.geller
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 11188538 via CL 11188549
#ROBOMERGE-BOT: (v640-11091645)

[CL 11189822 by ethan geller in Main branch]
2020-01-30 18:48:52 -05:00
ryan mangin
ecac024413 Undo changelist 11153200:
CL 1 of 3: Refactor Audio Device Manager.
[FYI] ethan.geller
#rb: none

#ROBOMERGE-OWNER: ryan.mangin
#ROBOMERGE-AUTHOR: ryan.mangin
#ROBOMERGE-SOURCE: CL 11160333 via CL 11160335
#ROBOMERGE-BOT: (v640-11091645)

[CL 11162634 by ryan mangin in Main branch]
2020-01-29 11:34:23 -05:00
ethan geller
4fff0cce59 CL 1 of 3: Refactor Audio Device Manager.
[FYI] aaron.mcleran, rob.gay


#ROBOMERGE-OWNER: ethan.geller
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 11153200 via CL 11153210
#ROBOMERGE-BOT: (v640-11091645)

[CL 11153252 by ethan geller in Main branch]
2020-01-29 05:00:56 -05:00
bob tellez
73f3d19f1f Back out changelist 11119764, 11119772, 11119809, 11119849, 11121802, 11125895, 11124508. AutoTest assert
[FYI] Rob.Gay


#ROBOMERGE-SOURCE: CL 11125898 via CL 11126424
#ROBOMERGE-BOT: (v640-11091645)

[CL 11126508 by bob tellez in Main branch]
2020-01-28 05:18:04 -05:00
rob gay
dd71a4cd08 - Deprecate AudioDevice implementation Engine/UnrealEngine monolythics & move to AudioDeviceManager
- Remove redundant static calls on AudioDevice in favor of AudioDeviceManager for finding Main/Active Devices (state managed by the manager, not individual devices)
#rb ethan.geller ryan.mangin


#ROBOMERGE-SOURCE: CL 11119764 via CL 11119771
#ROBOMERGE-BOT: (v640-11091645)

[CL 11119776 by rob gay in Main branch]
2020-01-27 15:55:07 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Rui Figueira
c6c755a1f3 UE-74862 : Reusable media encoder framework implementation
#rb Andriy.Tylychko

[CL 10462307 by Rui Figueira in Main branch]
2019-11-26 17:28:51 -05:00
Andriy Tylychko
9f65ad43a6 Merging //UE4/Private-3Lateral_Streaming to Main (//UE4/Main)
This mainly covers the new Pixel Streaming plugin version along with minor changes to other parts of the engine:
* removed multiple copies of FThread as it's now a part of Core
* changes to SlateUser required to fix user input in Pixel Streaming

This wasn't formally reviewed due to the size of Pixel Streaming changes, but was skimmed over by Zack Letters before integration

#rb zack.letters

[CL 9486237 by Andriy Tylychko in Main branch]
2019-10-09 08:21:27 -04:00
rui figueira
e7ab97092d Small improvement to avoid a compiler warning (Parameter with the same name as a member variable)
#rb NONE


#ROBOMERGE-SOURCE: CL 9123473 via CL 9123474 via CL 9123475
#ROBOMERGE-BOT: (v443-9013191)

[CL 9123476 by rui figueira in Main branch]
2019-09-26 07:59:32 -04:00
rui figueira
4d00acf272 Fixed the null audio device pace.
Improved GameplayMediaEncoder audio handling (timestamps and duration). It now also adjust the audio clock if it falls behind, such as if we break into the debugger.

[FYI] Aaron.McLeran, Matt.Hoffman
#rb Peter.Lockhart


#ROBOMERGE-SOURCE: CL 9123362 via CL 9123364 via CL 9123367
#ROBOMERGE-BOT: (v443-9013191)

[CL 9123369 by rui figueira in Main branch]
2019-09-26 07:27:04 -04:00
Andriy Tylychko
0a44d11072 removed all FThread definitions scattered around as it's now part of Core and was causing "already defined" error on Xbox
#rb rui.figueira
#jira FORT-210349

[CL 8820158 by Andriy Tylychko in Main branch]
2019-09-18 10:59:17 -04:00