izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge from Release-Engine-Test @ 16758890 to UE5/Main

Browse Source 
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719 (and Release-17.00 @ 16658211)

[CL 16763350 by aurel cordonnier in ue5-main branch]
This commit is contained in:
aurel cordonnier
2021-06-23 17:51:32 -04:00
parent 0d7a7d4e5d
commit d17d20ca36
27594 changed files with 146950 additions and 4625614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/AVEncoder/Private/Encoders/Amf/Amf_EncoderH264.cpp
+1 -2
View File
@@ -471,7 +471,7 @@ namespace AVEncoder
if (Buffer)
{
Buffer->Surface->SetPts(FTimespan::FromSeconds(FPlatformTime::Seconds()).GetTicks());
Buffer->Surface->SetPts(frame->GetTimestampRTP());
bForceNextKeyframe = options.bForceKeyFrame;
MaybeReconfigure(Buffer);
@@ -527,7 +527,6 @@ namespace AVEncoder
// create packet with buffer contents
FCodecPacketImpl Packet;
Packet.PTS = data->GetPts();
Packet.Data = static_cast<const uint8*>(OutBuffer->GetNative());
Packet.DataSize = OutBuffer->GetSize();
uint32 PictureType = AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE;
Engine/Source/Runtime/AVEncoder/Private/Encoders/NVENC/NVENC_EncoderH264.cpp
+2 -2
View File
@@ -526,7 +526,7 @@ namespace AVEncoder
LastKeyFrameTime = FDateTime::UtcNow();
PicParams.encodePicFlags |= NV_ENC_PIC_FLAG_FORCEIDR;
}
PicParams.inputTimeStamp = Buffer->TimeStamp = frame->PTS;
PicParams.inputTimeStamp = Buffer->TimeStamp = frame->GetTimestampUs();
PicParams.outputBitstream = Buffer->OutputBitstream;
PicParams.completionEvent = Buffer->CompletionEvent;
PicParams.pictureStruct = NV_ENC_PIC_STRUCT_FRAME;
@@ -622,7 +622,6 @@ namespace AVEncoder
// create packet with buffer contents
FCodecPacketImpl Packet;
Packet.PTS = static_cast<int64>(Buffer->TimeStamp);
Packet.Data = static_cast<const uint8*>(Buffer->BitstreamData);
Packet.DataSize = Buffer->BitstreamDataSize;
if (Buffer->PictureType == NV_ENC_PIC_TYPE_IDR)
@@ -746,6 +745,7 @@ namespace AVEncoder
if (InFrame->GetWidth() != Buffer->Width || InFrame->GetHeight() != Buffer->Height)
{
// Buffer is wrong resolution, destroy it and we will make a new buffer below
CreatedBuffers.Remove(Buffer);
DestroyBuffer(Buffer);
Buffer = nullptr;
}