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

CellVdecPicAttr

Browse source
This commit is contained in:
Megamouse 2022-04-12 01:31:57 +02:00
parent 771009f333
commit 548b748f50
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,8 @@ struct vdec_frame
u64 pts{}; u64 pts{};
u64 userdata{}; u64 userdata{};
u32 frc{}; u32 frc{};
bool PicItemRecieved = false; bool pic_item_received = false;
CellVdecPicAttr attr = CELL_VDEC_PICITEM_ATTR_NORMAL;
AVFrame* operator ->() const AVFrame* operator ->() const
{ {
@ -377,6 +378,8 @@ struct vdec_context final
next_dts = au_dts; next_dts = au_dts;
} }
const CellVdecPicAttr attr = au_mode == CELL_VDEC_DEC_MODE_NORMAL ? CELL_VDEC_PICITEM_ATTR_NORMAL : CELL_VDEC_PICITEM_ATTR_SKIPPED;
ctx->skip_frame = ctx->skip_frame =
au_mode == CELL_VDEC_DEC_MODE_NORMAL ? AVDISCARD_DEFAULT : au_mode == CELL_VDEC_DEC_MODE_NORMAL ? AVDISCARD_DEFAULT :
au_mode == CELL_VDEC_DEC_MODE_B_SKIP ? AVDISCARD_NONREF : AVDISCARD_NONINTRA; au_mode == CELL_VDEC_DEC_MODE_B_SKIP ? AVDISCARD_NONREF : AVDISCARD_NONINTRA;
@ -441,6 +444,7 @@ struct vdec_context final
frame.pts = next_pts; frame.pts = next_pts;
frame.dts = next_dts; frame.dts = next_dts;
frame.userdata = au_usrd; frame.userdata = au_usrd;
frame.attr = attr;
if (frc_set) if (frc_set)
{ {
@ -1199,20 +1203,22 @@ error_code cellVdecGetPicItem(u32 handle, vm::pptr<CellVdecPicItem> picItem)
u64 dts; u64 dts;
u64 usrd; u64 usrd;
u32 frc = 0; u32 frc = 0;
CellVdecPicAttr attr = CELL_VDEC_PICITEM_ATTR_NORMAL;
vm::ptr<CellVdecPicItem> info; vm::ptr<CellVdecPicItem> info;
{ {
std::lock_guard lock(vdec->mutex); std::lock_guard lock(vdec->mutex);
for (auto& picture : vdec->out_queue) for (auto& picture : vdec->out_queue)
{ {
if (!picture.PicItemRecieved) if (!picture.pic_item_received)
{ {
picture.PicItemRecieved = true; picture.pic_item_received = true;
frame = picture.avf.get(); frame = picture.avf.get();
pts = picture.pts; pts = picture.pts;
dts = picture.dts; dts = picture.dts;
usrd = picture.userdata; usrd = picture.userdata;
frc = picture.frc; frc = picture.frc;
attr = picture.attr;
info.set(vdec->mem_addr + vdec->mem_bias); info.set(vdec->mem_addr + vdec->mem_bias);
constexpr u64 size_needed = sizeof(all_info_t); constexpr u64 size_needed = sizeof(all_info_t);
@ -1252,7 +1258,7 @@ error_code cellVdecGetPicItem(u32 handle, vm::pptr<CellVdecPicItem> picItem)
info->auUserData[0] = usrd; info->auUserData[0] = usrd;
info->auUserData[1] = 0; info->auUserData[1] = 0;
info->status = CELL_OK; info->status = CELL_OK;
info->attr = CELL_VDEC_PICITEM_ATTR_NORMAL; info->attr = attr;
const vm::addr_t picinfo_addr{info.addr() + ::offset32(&all_info_t::picInfo)}; const vm::addr_t picinfo_addr{info.addr() + ::offset32(&all_info_t::picInfo)};
info->picInfo_addr = picinfo_addr; info->picInfo_addr = picinfo_addr;