archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 23:11:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cellVdecDecodeAu: add codec type check

Browse source
This commit is contained in:
Megamouse 2022-04-12 19:54:07 +02:00
parent fb3752a8ef
commit ee3a302cf2
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/Cell/Modules/cellVdec.cpp
View file

@ -1023,17 +1023,17 @@ error_code cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::cptr<CellVd
} }
} }
if (mode < 0 || mode > CELL_VDEC_DEC_MODE_PB_SKIP) if (mode < 0 || mode > (CELL_VDEC_DEC_MODE_B_SKIP | CELL_VDEC_DEC_MODE_PB_SKIP))
{ {
return { CELL_VDEC_ERROR_ARG, fmt::format("mode=%d", +mode) }; return { CELL_VDEC_ERROR_ARG, fmt::format("mode=%d", +mode) };
} }
// TODO: // TODO: what does the 3 stand for ?
//if ((mode == (CELL_VDEC_DEC_MODE_B_SKIP | CELL_VDEC_DEC_MODE_PB_SKIP) && something != 3) || if ((mode == CELL_VDEC_CODEC_TYPE_MAX && vdec->type != 3) ||
// (mode == CELL_VDEC_DEC_MODE_PB_SKIP && something != 1)) (mode == CELL_VDEC_DEC_MODE_PB_SKIP && vdec->type != CELL_VDEC_CODEC_TYPE_AVC))
//{ {
// return CELL_VDEC_ERROR_ARG; return { CELL_VDEC_ERROR_ARG, fmt::format("mode=%d, type=%d", +mode, vdec->type) };
//} }
if (!vdec->au_count.try_inc(4)) if (!vdec->au_count.try_inc(4))
{ {

1
rpcs3/Emu/Cell/Modules/cellVdec.h
View file

@ -17,6 +17,7 @@ enum CellVdecCodecType : s32
CELL_VDEC_CODEC_TYPE_MPEG2 = 0, CELL_VDEC_CODEC_TYPE_MPEG2 = 0,
CELL_VDEC_CODEC_TYPE_AVC = 1, CELL_VDEC_CODEC_TYPE_AVC = 1,
CELL_VDEC_CODEC_TYPE_DIVX = 5, CELL_VDEC_CODEC_TYPE_DIVX = 5,
CELL_VDEC_CODEC_TYPE_MAX
}; };
// Callback Messages // Callback Messages