Merge pull request #14033 from sum2012/warmup_patch6

Mpeg:Only allow firmware >= 6 for warmup
This commit is contained in:
Henrik Rydgård 2021-01-31 11:09:07 +01:00 committed by GitHub
commit ce2e47f353
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1585,8 +1585,9 @@ static int sceMpegGetAvcAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
ERROR_LOG_REPORT(ME, "sceMpegGetAvcAu(%08x, %08x, %08x, %08x): invalid ringbuffer address", mpeg, streamId, auAddr, attrAddr);
return -1;
}
int sdkver = sceKernelGetCompiledSdkVersion();
if ((sdkver >= 0x03000000) && (ctx->mpegwarmUp < MPEG_WARMUP_FRAMES)) {
if ((sdkver >= 0x06000000) && (ctx->mpegwarmUp < MPEG_WARMUP_FRAMES)) {
DEBUG_LOG(ME, "sceMpegGetAvcAu(%08x, %08x, %08x, %08x): warming up", mpeg, streamId, auAddr, attrAddr);
ctx->mpegwarmUp++;
return ERROR_MPEG_NO_DATA;