Commit Graph

11 Commits

Author SHA1 Message Date
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
Rui Figueira
e9a6985d4a #jira UE-74647
#jira UE-74648
#jira UE-74649

General improvements to the FHighlightRecorder class.
Also, it now works in PIE too.

#rb Josie.Yang

[CL 6628795 by Rui Figueira in Main branch]
2019-05-24 09:28:17 -04:00
peter lockhart
93d891b64f Fix critical section bug where the audio mixer and the game thread can become stuck/deadlock on 2 mutexes triggered in reverse order.
Stopping a video recording via console command or via API can cause indefinite hang. Repo rate is 1/40.

#rb Rui.Figueira
#rnx


Deadlock occurs with MainThread and Audio FMixerDevice.

MainThread:

HighlightRecorder::Stop()

GameMediaEncorder::UnregisterListener (Locks Listener Mutex)

......

FMixerDevice::UnregisterSubmixBufferListener

FMixerSubmix::UnregisterBufferListener (Locks BufferListenerCriticalSection)



FMixerDevice:

FMixerDevice::ONProcessAudioStream

FMixerSubmix:: ProcessAudio (Locks BufferListenerCriticalSection)

......

FGameplayMediaEncoder::OnMediaSampleReady (Locks Listener Mutex)


#ROBOMERGE-SOURCE: CL 6104242 via CL 6104243 via CL 6104288

[CL 6104309 by peter lockhart in Main branch]
2019-04-26 05:52:24 -04:00
Ben Marsh
8e5df78882 Fix copyright notices.
#rb none
#jira UE-70961

[CL 5381051 by Ben Marsh in Main branch]
2019-03-13 09:42:39 -04:00
Andrew Grant
da2cbfff1f Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

[CL 5361784 by Andrew Grant in Main branch]
2019-03-11 15:12:02 -04:00
Rolando Caloca
8f1665648b UE4 - Workaround deprecation warnings
#rb none
#jira UE-71246
#rnx

[CL 5359623 by Rolando Caloca in Main branch]
2019-03-11 11:17:34 -04:00
Marcus Wassmer
459dd9960c Force integrate 5317515 from release-4.22 to fix some issues with 'undo'.
#rb none

[CL 5337699 by Marcus Wassmer in Main branch]
2019-03-07 11:25:32 -05:00
Juan Canada
d2f93b57b2 Undo //UE4/Main/... changelist 5335728
#rb marcus.wassmer

[CL 5335770 by Juan Canada in Main branch]
2019-03-06 23:59:18 -05:00
Juan Canada
27b0d7a824 Copying //UE4/Private-Woodchuck-Staging[at]5316917 to Release-4.22 (//UE4/Release-4.22)
#rb none
#JIRA

#ROBOMERGE-OWNER: Juan.Canada
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5317515 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5335728 by Juan Canada in Main branch]
2019-03-06 23:42:45 -05:00
Josh Adams
2aeb37c520 - Fixes for Clang issues from recent merge
#rb none

[CL 5229876 by Josh Adams in Main branch]
2019-02-27 16:24:46 -05:00
Josh Adams
d0bf843c9c - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024

[CL 5226277 by Josh Adams in Main branch]
2019-02-27 11:57:17 -05:00