Commit Graph

8 Commits

Author SHA1 Message Date
ben marsh
83bd3cd7c6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6631504 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6748759 by ben marsh in Dev-Anim branch]
2019-05-31 18:06:13 -04:00
rui figueira
b2c61f7bb4 #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

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rui.figueira
#ROBOMERGE-SOURCE: CL 6628795 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6748441 by rui figueira in Dev-Anim branch]
2019-05-31 18:03:57 -04:00
peter lockhart
9d30969f5a 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-OWNER: lina.halper
#ROBOMERGE-AUTHOR: peter.lockhart
#ROBOMERGE-SOURCE: CL 6104242 via CL 6104243 via CL 6104288 via CL 6104309
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6127200 by peter lockhart in Dev-Anim branch]
2019-04-26 22:16:59 -04:00
ben marsh
65461077c9 Fix copyright notices.
#rb none
#jira UE-70961

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5381051 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5384827 by ben marsh in Dev-Anim branch]
2019-03-13 13:00:45 -04:00
lina halper
e178dc3a39 Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5361784 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5380699 by lina halper in Dev-Anim branch]
2019-03-13 09:34:35 -04:00
rolando caloca
7121accc61 UE4 - Workaround deprecation warnings
#rb none
#jira UE-71246
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5359623 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5377083 by rolando caloca in Dev-Anim branch]
2019-03-12 21:39:44 -04:00
Thomas Sarkanen
bb193db1aa Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5356908
#rb none

[CL 5360337 by Thomas Sarkanen in Dev-Anim branch]
2019-03-11 12:18:32 -04:00
Thomas Sarkanen
474bc576ee Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5236305
#rb none
#jira none

[CL 5236785 by Thomas Sarkanen in Dev-Anim branch]
2019-02-28 04:41:36 -05:00