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

cellSysutilAvc2Load_shared: re-arrange streaming_mode checks

Browse source
This commit is contained in:
Megamouse 2024-04-12 21:35:04 +02:00
parent cb1fb19dea
commit 96bd150518
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp
View file

@ -702,26 +702,7 @@ error_code cellSysutilAvc2Load_shared(SceNpMatching2ContextId ctx_id, u32 contai
u32 streaming_mode = init_param->direct_streaming_mode; u32 streaming_mode = init_param->direct_streaming_mode;
if (init_param->avc_init_param_version < 120) if (init_param->avc_init_param_version >= 120)
{
if (init_param->avc_init_param_version >= 110)
{
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) switch (init_param->direct_streaming_mode)
{ {
@ -741,6 +722,22 @@ error_code cellSysutilAvc2Load_shared(SceNpMatching2ContextId ctx_id, u32 contai
return CELL_AVC2_ERROR_INVALID_ARGUMENT; return CELL_AVC2_ERROR_INVALID_ARGUMENT;
} }
} }
else if (init_param->avc_init_param_version >= 110)
{
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;
}
settings.streaming_mode = streaming_mode; settings.streaming_mode = streaming_mode;
settings.mic_out_stream_sharing = init_param->voice_param.mic_out_stream_sharing; settings.mic_out_stream_sharing = init_param->voice_param.mic_out_stream_sharing;