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

cellDmuxPamf: review fixes + improvements

Browse source
This commit is contained in:
capriots 2025-09-27 17:14:17 +02:00 committed by Elad
parent 6a6425d2ee
commit 5c35fc9e8f
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp
View file

@ -1295,7 +1295,7 @@ void DmuxPamfContext::exec(ppu_thread& ppu)
case dmux_pamf_state::setting_au_reset_error: goto label10_setting_au_reset_error_state; case dmux_pamf_state::setting_au_reset_error: goto label10_setting_au_reset_error_state;
case dmux_pamf_state::processing_event: goto label11_processing_event_state; case dmux_pamf_state::processing_event: goto label11_processing_event_state;
case dmux_pamf_state::au_found_waiting_for_spu: goto label12_au_found_waiting_for_spu_state; case dmux_pamf_state::au_found_waiting_for_spu: goto label12_au_found_waiting_for_spu_state;
case dmux_pamf_state::unsetting_au_cancel: goto label13_unsetting_au_cancel_state; case dmux_pamf_state::unsetting_au_reset: goto label13_unsetting_au_reset_state;
case dmux_pamf_state::demux_done_notifying: goto label14_demux_done_notifying_state; case dmux_pamf_state::demux_done_notifying: goto label14_demux_done_notifying_state;
case dmux_pamf_state::demux_done_mutex_lock: goto label15_demux_done_mutex_lock_state; case dmux_pamf_state::demux_done_mutex_lock: goto label15_demux_done_mutex_lock_state;
case dmux_pamf_state::demux_done_cond_signal: goto label16_demux_done_cond_signal_state; case dmux_pamf_state::demux_done_cond_signal: goto label16_demux_done_cond_signal_state;
@ -1477,14 +1477,11 @@ void DmuxPamfContext::exec(ppu_thread& ppu)
au_info->specific_info_size = es->au_specific_info_size; au_info->specific_info_size = es->au_specific_info_size;
au_info->is_rap = static_cast<b8>(event.au_found.is_rap); au_info->is_rap = static_cast<b8>(event.au_found.is_rap);
if (!is_raw_es) if (!is_raw_es && dmuxPamfStreamIdToTypeChannel(event.au_found.stream_id, event.au_found.private_stream_id).first == DMUX_PAMF_STREAM_TYPE_INDEX_LPCM)
{ {
if (dmuxPamfStreamIdToTypeChannel(event.au_found.stream_id, event.au_found.private_stream_id).first == DMUX_PAMF_STREAM_TYPE_INDEX_LPCM) es->au_specific_info[0] = read_from_ptr<u8>(event.au_found.stream_header_buf) >> 4;
{ es->au_specific_info[1] = read_from_ptr<u8>(event.au_found.stream_header_buf) & 0xf;
es->au_specific_info[0] = read_from_ptr<u8>(event.au_found.stream_header_buf) >> 4; es->au_specific_info[2] = read_from_ptr<u8>(&event.au_found.stream_header_buf[1]) >> 6;
es->au_specific_info[1] = read_from_ptr<u8>(event.au_found.stream_header_buf) & 0xf;
es->au_specific_info[2] = read_from_ptr<u8>(&event.au_found.stream_header_buf[1]) >> 6;
}
} }
if (sys_mutex_unlock(ppu, mutex) != CELL_OK) if (sys_mutex_unlock(ppu, mutex) != CELL_OK)
@ -1509,8 +1506,8 @@ void DmuxPamfContext::exec(ppu_thread& ppu)
{ {
stream_reset_in_progress = false; stream_reset_in_progress = false;
savestate = dmux_pamf_state::unsetting_au_cancel; savestate = dmux_pamf_state::unsetting_au_reset;
label13_unsetting_au_cancel_state: label13_unsetting_au_reset_state:
if (set_au_reset<false>(ppu) != CELL_OK) if (set_au_reset<false>(ppu) != CELL_OK)
{ {
@ -1763,7 +1760,7 @@ u32 dmuxPamfGetAuQueueMaxSize(u16 stream_id, u16 private_stream_id)
u32 dmuxPamfGetLpcmAuSize(vm::cptr<CellDmuxPamfEsSpecificInfoLpcm> lpcm_info) u32 dmuxPamfGetLpcmAuSize(vm::cptr<CellDmuxPamfEsSpecificInfoLpcm> lpcm_info)
{ {
return lpcm_info->samplingFreq * lpcm_info->bitsPerSample * (lpcm_info->numOfChannels + (lpcm_info->numOfChannels & 1)) / 1600; // Streams with an odd number of channels contain an empty dummy channel return lpcm_info->samplingFreq * lpcm_info->bitsPerSample / CHAR_BIT * (lpcm_info->numOfChannels + (lpcm_info->numOfChannels & 1)) / DMUX_PAMF_LPCM_FRAMES_PER_SEC; // Streams with an odd number of channels contain an empty dummy channel
} }
u32 dmuxPamfGetAuQueueBufferSize(u16 stream_id, u16 private_stream_id, bool is_avc, vm::cptr<void> es_specific_info) u32 dmuxPamfGetAuQueueBufferSize(u16 stream_id, u16 private_stream_id, bool is_avc, vm::cptr<void> es_specific_info)
@ -2014,6 +2011,8 @@ error_code _CellDmuxCoreOpOpen(ppu_thread& ppu, vm::cptr<CellDmuxPamfSpecificInf
} }
ensure(demuxerResource->memAddr.aligned(0x10)); // Not checked on LLE ensure(demuxerResource->memAddr.aligned(0x10)); // Not checked on LLE
ensure(demuxerResource->memSize >= sizeof(CellDmuxPamfHandle)); // Not checked on LLE
ensure(vm::check_addr(demuxerResource->memAddr.addr(), vm::page_readable | vm::page_writable, demuxerResource->memSize));
const auto _handle = vm::static_ptr_cast<CellDmuxPamfHandle>(demuxerResource->memAddr); const auto _handle = vm::static_ptr_cast<CellDmuxPamfHandle>(demuxerResource->memAddr);
@ -2547,6 +2546,8 @@ error_code _CellDmuxCoreOpEnableEs(ppu_thread& ppu, vm::ptr<CellDmuxPamfHandle>
} }
ensure(!!esHandle && esResource->memAddr.aligned(0x10)); // Not checked on LLE ensure(!!esHandle && esResource->memAddr.aligned(0x10)); // Not checked on LLE
ensure(esResource->memSize >= sizeof(CellDmuxPamfEsHandle)); // Not checked on LLE
ensure(vm::check_addr(esResource->memAddr.addr(), vm::page_readable | vm::page_writable, esResource->memSize));
const auto es_handle = vm::static_ptr_cast<CellDmuxPamfEsHandle>(esResource->memAddr); const auto es_handle = vm::static_ptr_cast<CellDmuxPamfEsHandle>(esResource->memAddr);

4
rpcs3/Emu/Cell/Modules/cellDmuxPamf.h
View file

@ -783,6 +783,8 @@ enum CellDmuxPamfLpcmBitsPerSamples
CELL_DMUX_PAMF_LPCM_BITS_PER_SAMPLE_24 = 3, CELL_DMUX_PAMF_LPCM_BITS_PER_SAMPLE_24 = 3,
}; };
constexpr u8 DMUX_PAMF_LPCM_FRAMES_PER_SEC = 200;
struct CellDmuxPamfSpecificInfo struct CellDmuxPamfSpecificInfo
{ {
be_t<u32> thisSize; be_t<u32> thisSize;
@ -832,7 +834,7 @@ enum class dmux_pamf_state : u8
setting_au_reset_error, setting_au_reset_error,
processing_event, processing_event,
au_found_waiting_for_spu, au_found_waiting_for_spu,
unsetting_au_cancel, unsetting_au_reset,
demux_done_notifying, demux_done_notifying,
demux_done_mutex_lock, demux_done_mutex_lock,
demux_done_cond_signal, demux_done_cond_signal,