Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cellSysutilAvc2Load: param checks #15439

Merged
merged 9 commits into from
Apr 12, 2024
Merged

cellSysutilAvc2Load: param checks #15439

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2ebcd80
cellSysutilAvc2Load: param checks
Megamouse Apr 12, 2024
3b31229
move cellSysutilAvc2LoadAsync to cellSysutilAvc2Load
Megamouse Apr 12, 2024
806161e
Fix callback_func check for CELL_SYSUTIL_AVC2_VIDEO_CHAT
Megamouse Apr 12, 2024
fce523c
Only send cellSysutilAvc2LoadAsync callback with CELL_SYSUTIL_AVC2_VO…
Megamouse Apr 12, 2024
a5068d0
cellSysutilAvc2Load_shared: fix compilation
Megamouse Apr 12, 2024
2bd7f9a
cellSysutilAvc2Load_shared: use utils::align for total_bitrate
Megamouse Apr 12, 2024
c082506
cellSysutilAvc2Load_shared: review fixes
Megamouse Apr 12, 2024
5732928
cellSysutilAvc2Load_shared: re-arrange streaming_mode checks
Megamouse Apr 12, 2024
19fb0c1
cellSysutilAvc2Load_shared: simplify max_video_windows check
Megamouse Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 206 additions & 23 deletions rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ struct avc2_settings

vm::ptr<CellSysutilAvc2Callback> avc2_cb{};
vm::ptr<void> avc2_cb_arg{};
u32 streaming_mode = CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL;
u8 mic_out_stream_sharing = 0;
u8 video_stream_sharing = 0;
u32 unk = 0;
};

error_code cellSysutilAvc2GetPlayerInfo(vm::cptr<SceNpMatching2RoomMemberId> player_id, vm::ptr<CellSysutilAvc2PlayerInfo> player_info)
Expand Down Expand Up @@ -250,27 +254,6 @@ error_code cellSysutilAvc2GetAttribute(vm::ptr<CellSysutilAvc2Attribute> attr)
return CELL_OK;
}

error_code cellSysutilAvc2LoadAsync(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
{
cellSysutilAvc2.warning("cellSysutilAvc2LoadAsync(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);

auto& settings = g_fxo->get<avc2_settings>();

settings.avc2_cb = callback_func;
settings.avc2_cb_arg = user_data;

if (settings.avc2_cb)
{
sysutil_register_cb([=, avc2_cb = settings.avc2_cb, avc2_cb_arg = settings.avc2_cb_arg](ppu_thread& cb_ppu) -> s32
{
avc2_cb(cb_ppu, CELL_AVC2_EVENT_LOAD_SUCCEEDED, 0, avc2_cb_arg);
return 0;
});
}

return CELL_OK;
}

error_code cellSysutilAvc2SetSpeakerVolumeLevel(f32 level)
{
cellSysutilAvc2.todo("cellSysutilAvc2SetSpeakerVolumeLevel(level=0x%x)", level);
Expand Down Expand Up @@ -686,14 +669,214 @@ error_code cellSysutilAvc2SetSpeakerMuting(u8 muting)
return CELL_OK;
}

error_code cellSysutilAvc2Load_shared(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
{
if (!init_param || !init_param->avc_init_param_version ||
!(init_param->avc_init_param_version == 100 ||
init_param->avc_init_param_version == 110 ||
init_param->avc_init_param_version == 120 ||
init_param->avc_init_param_version == 130 ||
init_param->avc_init_param_version == 140)
)
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}

auto& settings = g_fxo->get<avc2_settings>();

switch (init_param->media_type)
{
case CELL_SYSUTIL_AVC2_VOICE_CHAT:
{
if (init_param->max_players < 2 ||
init_param->max_players > 64 ||
init_param->spu_load_average > 100 ||
init_param->voice_param.voice_quality != CELL_SYSUTIL_AVC2_VOICE_QUALITY_NORMAL ||
init_param->voice_param.max_speakers == 0 ||
init_param->voice_param.max_speakers > 16
)
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}

uint32_t streaming_mode = init_param->direct_streaming_mode;
Megamouse marked this conversation as resolved.
Show resolved Hide resolved

if (init_param->avc_init_param_version < 120)
{
if (init_param->avc_init_param_version >= 110)
elad335 marked this conversation as resolved.
Show resolved Hide resolved
{
switch (init_param->direct_streaming_mode)
{
case CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL:
case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_WAN:
break;
case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_LAN:
default:
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}
}
else
{
streaming_mode = settings.streaming_mode;
}
}
else
{
switch (init_param->direct_streaming_mode)
{
case CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL:
streaming_mode = CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL;
break;
case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_WAN:
break;
case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_LAN:
if (init_param->streaming_mode.mode == CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL)
{
settings.streaming_mode = streaming_mode;
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}
break;
default:
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}
}

settings.streaming_mode = streaming_mode;
settings.mic_out_stream_sharing = init_param->voice_param.mic_out_stream_sharing;

if (!callback_func)
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}

if (settings.avc2_cb)
{
return CELL_AVC2_ERROR_ALREADY_INITIALIZED;
}

settings.avc2_cb = callback_func;
settings.avc2_cb_arg = user_data;

// TODO
//return cellSysutilRegisterCallbackDispatcher(0x120, &PTR_LAB_0000552c);
Megamouse marked this conversation as resolved.
Show resolved Hide resolved
break;
}
case CELL_SYSUTIL_AVC2_VIDEO_CHAT:
{
if (false) // TODO: syscall to check container
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}

if (init_param->avc_init_param_version <= 140)
{
if (false) // TODO
{
return CELL_AVC2_ERROR_OUT_OF_MEMORY;
}
}

if (callback_func)
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}

bool is_invalid = false;
Megamouse marked this conversation as resolved.
Show resolved Hide resolved

if (init_param->video_param.frame_mode == CELL_SYSUTIL_AVC2_FRAME_MODE_NORMAL)
{
if (init_param->video_param.max_video_windows == 0 || init_param->video_param.max_video_windows > 6)
Megamouse marked this conversation as resolved.
Show resolved Hide resolved
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}
}
else
{
if (init_param->video_param.max_video_windows == 0 || init_param->video_param.max_video_windows > 16)
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}
}

if (init_param->video_param.max_video_bitrate < 1000 || init_param->video_param.max_video_bitrate > 512000)
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}

if (init_param->video_param.max_video_framerate == 0 || init_param->video_param.max_video_framerate > 30)
{
return CELL_AVC2_ERROR_INVALID_ARGUMENT;
}

s32 bitrate = 0;

switch (init_param->video_param.max_video_resolution)
{
case CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QQVGA:
bitrate = 76800;
break;
case CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QVGA:
bitrate = 307200;
break;
default:
break;
}

u32 unk = 0;

if (bitrate != 0)
{
u32 window_count = init_param->video_param.max_video_windows;

if (init_param->video_param.video_stream_sharing == CELL_SYSUTIL_AVC2_VIDEO_SHARING_MODE_2)
{
window_count++;
}

const u32 total_bitrate = window_count * bitrate;
unk = ((s32(total_bitrate) >> 0x14) + u32(s32(total_bitrate) < 0 && (total_bitrate & 0xfffff) != 0)) * 0x100000 + 0x100000;
Megamouse marked this conversation as resolved.
Show resolved Hide resolved
}

settings.video_stream_sharing = init_param->video_param.video_stream_sharing;
settings.unk = unk;
break;
}
default:
return CELL_AVC2_ERROR_NOT_SUPPORTED;
}

return CELL_OK;
}

error_code cellSysutilAvc2Load(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
{
cellSysutilAvc2.warning("cellSysutilAvc2Load(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);

error_code error = cellSysutilAvc2Load_shared(ctx_id, container, callback_func, user_data, init_param);
if (error != CELL_OK)
return error;

return CELL_OK;
}

error_code cellSysutilAvc2LoadAsync(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
{
cellSysutilAvc2.warning("cellSysutilAvc2LoadAsync(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);

error_code error = cellSysutilAvc2Load_shared(ctx_id, container, callback_func, user_data, init_param);
if (error != CELL_OK)
return error;

auto& settings = g_fxo->get<avc2_settings>();

settings.avc2_cb = callback_func;
settings.avc2_cb_arg = user_data;
if (settings.avc2_cb && init_param && init_param->media_type == CELL_SYSUTIL_AVC2_VOICE_CHAT)
{
sysutil_register_cb([=, avc2_cb = settings.avc2_cb, avc2_cb_arg = settings.avc2_cb_arg](ppu_thread& cb_ppu) -> s32
{
avc2_cb(cb_ppu, CELL_AVC2_EVENT_LOAD_SUCCEEDED, 0, avc2_cb_arg);
return 0;
});
}

return CELL_OK;
}
Expand Down
Loading