ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cellVdecGetPicture accurate error checking

This commit is contained in:
RipleyTom 2018-11-15 00:42:42 +01:00 committed by Ivan
parent 0044eb44e2
commit f4fb5200a0
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Cell/Modules/cellVdec.cpp
View File

@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "Emu/System.h"
#include "Emu/IdManager.h"
#include "Emu/Cell/PPUModule.h"
@ -551,7 +551,7 @@ s32 cellVdecGetPicture(u32 handle, vm::cptr<CellVdecPicFormat> format, vm::ptr<u
const auto vdec = idm::get<vdec_context>(handle);
if (!format || !vdec)
if (!format || !vdec || format->formatType > 4 || (format->formatType <= CELL_VDEC_PICFMT_RGBA32_ILV && format->colorMatrixType > CELL_VDEC_COLOR_MATRIX_TYPE_BT709))
{
return CELL_VDEC_ERROR_ARG;
}
@ -599,10 +599,6 @@ s32 cellVdecGetPicture(u32 handle, vm::cptr<CellVdecPicFormat> format, vm::ptr<u
}
// TODO: color matrix
if (format->colorMatrixType & ~1)
{
fmt::throw_exception("Unknown colorMatrixType (%d)" HERE, format->colorMatrixType);
}
if (alpha_plane)
{

14
rpcs3/Emu/Cell/Modules/cellVdec.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
@ -39,7 +39,7 @@ enum CellVdecDecodeMode : s32
};
// Output Picture Format Type
enum CellVdecPicFormatType : s32
enum CellVdecPicFormatType : u32
{
CELL_VDEC_PICFMT_ARGB32_ILV,
CELL_VDEC_PICFMT_RGBA32_ILV,
@ -48,7 +48,7 @@ enum CellVdecPicFormatType : s32
};
// Output Color Matrix Coef
enum CellVdecColorMatrixType : s32
enum CellVdecColorMatrixType : u32
{
CELL_VDEC_COLOR_MATRIX_TYPE_BT601,
CELL_VDEC_COLOR_MATRIX_TYPE_BT709,
@ -157,15 +157,15 @@ struct CellVdecPicItem
// Output Picture Format
struct CellVdecPicFormat
{
be_t<s32> formatType; // CellVdecPicFormatType
be_t<s32> colorMatrixType; // CellVdecColorMatrixType
be_t<u32> formatType; // CellVdecPicFormatType
be_t<u32> colorMatrixType; // CellVdecColorMatrixType
u8 alpha;
};
struct CellVdecPicFormat2
{
be_t<s32> formatType; // CellVdecPicFormatType
be_t<s32> colorMatrixType; // CellVdecColorMatrixType
be_t<u32> formatType; // CellVdecPicFormatType
be_t<u32> colorMatrixType; // CellVdecColorMatrixType
be_t<u32> unk0;
u8 alpha;
be_t<u32> unk1;