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

a128() removed

Browse source
This commit is contained in:
Nekotekina 2015-01-11 15:13:18 +03:00
parent da09477be8
commit c89d2cf138
4 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/SysCalls/Modules/cellDmux.cpp
View file

@ -83,7 +83,7 @@ PesHeader::PesHeader(DemuxerStream& stream)
ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr<CellDmuxCbEsMsg> cbFunc, u32 cbArg, u32 spec) ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr<CellDmuxCbEsMsg> cbFunc, u32 cbArg, u32 spec)
: dmux(dmux) : dmux(dmux)
, memAddr(a128(addr)) , memAddr(align(addr, 128))
, memSize(size - (addr - memAddr)) , memSize(size - (addr - memAddr))
, fidMajor(fidMajor) , fidMajor(fidMajor)
, fidMinor(fidMinor) , fidMinor(fidMinor)
@ -92,7 +92,7 @@ ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMaj
, cbFunc(cbFunc) , cbFunc(cbFunc)
, cbArg(cbArg) , cbArg(cbArg)
, spec(spec) , spec(spec)
, put(a128(addr)) , put(align(addr, 128))
, put_count(0) , put_count(0)
, got_count(0) , got_count(0)
, released(0) , released(0)
@ -184,7 +184,7 @@ void ElementaryStream::push_au(u32 size, u64 dts, u64 pts, u64 userdata, bool ra
addr = put; addr = put;
put = a128(put + 128 + size); put = align(put + 128 + size, 128);
put_count++; put_count++;
} }
@ -347,7 +347,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
if (!stream.peek(code)) if (!stream.peek(code))
{ {
// demuxing finished // demuxing finished
auto dmuxMsg = vm::ptr<CellDmuxMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto dmuxMsg = vm::ptr<CellDmuxMsg>::make(dmux.memAddr + (cb_add ^= 16));
dmuxMsg->msgType = CELL_DMUX_MSG_TYPE_DEMUX_DONE; dmuxMsg->msgType = CELL_DMUX_MSG_TYPE_DEMUX_DONE;
dmuxMsg->supplementalInfo = stream.userdata; dmuxMsg->supplementalInfo = stream.userdata;
dmux.cbFunc(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg); dmux.cbFunc(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg);
@ -497,7 +497,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
//cellDmux->Notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", ((be_t<u64>*)data)->ToLE(), frame_size); //cellDmux->Notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", ((be_t<u64>*)data)->ToLE(), frame_size);
auto esMsg = vm::ptr<CellDmuxEsMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto esMsg = vm::ptr<CellDmuxEsMsg>::make(dmux.memAddr + (cb_add ^= 16));
esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND; esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND;
esMsg->supplementalInfo = stream.userdata; esMsg->supplementalInfo = stream.userdata;
es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg); es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg);
@ -562,7 +562,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
es.push_au(old_size, es.last_dts, es.last_pts, stream.userdata, false /* TODO: set correct value */, 0); es.push_au(old_size, es.last_dts, es.last_pts, stream.userdata, false /* TODO: set correct value */, 0);
// callback // callback
auto esMsg = vm::ptr<CellDmuxEsMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto esMsg = vm::ptr<CellDmuxEsMsg>::make(dmux.memAddr + (cb_add ^= 16));
esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND; esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND;
esMsg->supplementalInfo = stream.userdata; esMsg->supplementalInfo = stream.userdata;
es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg); es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg);
@ -634,7 +634,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
case dmuxResetStream: case dmuxResetStream:
case dmuxResetStreamAndWaitDone: case dmuxResetStreamAndWaitDone:
{ {
auto dmuxMsg = vm::ptr<CellDmuxMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto dmuxMsg = vm::ptr<CellDmuxMsg>::make(dmux.memAddr + (cb_add ^= 16));
dmuxMsg->msgType = CELL_DMUX_MSG_TYPE_DEMUX_DONE; dmuxMsg->msgType = CELL_DMUX_MSG_TYPE_DEMUX_DONE;
dmuxMsg->supplementalInfo = stream.userdata; dmuxMsg->supplementalInfo = stream.userdata;
dmux.cbFunc(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg); dmux.cbFunc(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg);
@ -722,7 +722,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
es.push_au(old_size, es.last_dts, es.last_pts, stream.userdata, false, 0); es.push_au(old_size, es.last_dts, es.last_pts, stream.userdata, false, 0);
// callback // callback
auto esMsg = vm::ptr<CellDmuxEsMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto esMsg = vm::ptr<CellDmuxEsMsg>::make(dmux.memAddr + (cb_add ^= 16));
esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND; esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND;
esMsg->supplementalInfo = stream.userdata; esMsg->supplementalInfo = stream.userdata;
es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg); es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg);
@ -734,7 +734,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
} }
// callback // callback
auto esMsg = vm::ptr<CellDmuxEsMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto esMsg = vm::ptr<CellDmuxEsMsg>::make(dmux.memAddr + (cb_add ^= 16));
esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_FLUSH_DONE; esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_FLUSH_DONE;
esMsg->supplementalInfo = stream.userdata; esMsg->supplementalInfo = stream.userdata;
es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg); es.cbFunc(*dmux.dmuxCb, dmux.id, es.id, esMsg, es.cbArg);

3
rpcs3/Emu/SysCalls/Modules/cellDmux.h
View file

@ -1,8 +1,5 @@
#pragma once #pragma once
// align size or address to 128
#define a128(x) ((x + 127) & (~127))
// Error Codes // Error Codes
enum enum
{ {

4
rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
View file

@ -693,7 +693,7 @@ int cellVdecGetPicture(u32 handle, vm::ptr<const CellVdecPicFormat> format, vm::
if (outBuff) if (outBuff)
{ {
u32 buf_size = a128(av_image_get_buffer_size(vdec->ctx->pix_fmt, vdec->ctx->width, vdec->ctx->height, 1)); const u32 buf_size = align(av_image_get_buffer_size(vdec->ctx->pix_fmt, vdec->ctx->width, vdec->ctx->height, 1), 128);
if (format->formatType != CELL_VDEC_PICFMT_YUV420_PLANAR) if (format->formatType != CELL_VDEC_PICFMT_YUV420_PLANAR)
{ {
@ -753,7 +753,7 @@ int cellVdecGetPicItem(u32 handle, vm::ptr<u32> picItem_ptr)
info->codecType = vdec->type; info->codecType = vdec->type;
info->startAddr = 0x00000123; // invalid value (no address for picture) info->startAddr = 0x00000123; // invalid value (no address for picture)
info->size = a128(av_image_get_buffer_size(vdec->ctx->pix_fmt, vdec->ctx->width, vdec->ctx->height, 1)); info->size = align(av_image_get_buffer_size(vdec->ctx->pix_fmt, vdec->ctx->width, vdec->ctx->height, 1), 128);
info->auNum = 1; info->auNum = 1;
info->auPts[0].lower = (u32)vf.pts; info->auPts[0].lower = (u32)vf.pts;
info->auPts[0].upper = vf.pts >> 32; info->auPts[0].upper = vf.pts >> 32;

2
rpcs3/Emu/SysCalls/Modules/cellVdec.h
View file

@ -1,7 +1,5 @@
#pragma once #pragma once
#define a128(x) ((x + 127) & (~127))
// Error Codes // Error Codes
enum enum
{ {