RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 04:32:35 +01:00
Code Issues Releases Wiki Activity

cellSysutilAvc2Load_shared: use utils::align for total_bitrate

Browse Source
This commit is contained in:
Megamouse 2024-04-12 21:17:07 +02:00
parent a989634ba5
commit 3b37f5b156
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp
View File

@ -1,6 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "util/asm.hpp"
#include "sceNp.h" #include "sceNp.h"
#include "sceNp2.h" #include "sceNp2.h"
@ -70,7 +71,7 @@ struct avc2_settings
u32 streaming_mode = CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL; u32 streaming_mode = CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL;
u8 mic_out_stream_sharing = 0; u8 mic_out_stream_sharing = 0;
u8 video_stream_sharing = 0; u8 video_stream_sharing = 0;
u32 unk = 0; u32 total_video_bitrate = 0;
}; };
error_code cellSysutilAvc2GetPlayerInfo(vm::cptr<SceNpMatching2RoomMemberId> player_id, vm::ptr<CellSysutilAvc2PlayerInfo> player_info) error_code cellSysutilAvc2GetPlayerInfo(vm::cptr<SceNpMatching2RoomMemberId> player_id, vm::ptr<CellSysutilAvc2PlayerInfo> player_info)
@ -756,9 +757,6 @@ error_code cellSysutilAvc2Load_shared(SceNpMatching2ContextId ctx_id, u32 contai
settings.avc2_cb = callback_func; settings.avc2_cb = callback_func;
settings.avc2_cb_arg = user_data; settings.avc2_cb_arg = user_data;
// TODO
//return cellSysutilRegisterCallbackDispatcher(0x120, &PTR_LAB_0000552c);
break; break;
} }
case CELL_SYSUTIL_AVC2_VIDEO_CHAT: case CELL_SYSUTIL_AVC2_VIDEO_CHAT:
@ -822,7 +820,7 @@ error_code cellSysutilAvc2Load_shared(SceNpMatching2ContextId ctx_id, u32 contai
break; break;
} }
u32 unk = 0; u32 total_bitrate = 0;
if (bitrate != 0) if (bitrate != 0)
{ {
@ -833,12 +831,11 @@ error_code cellSysutilAvc2Load_shared(SceNpMatching2ContextId ctx_id, u32 contai
window_count++; window_count++;
} }
const u32 total_bitrate = window_count * bitrate; total_bitrate = utils::align<u32>(window_count * bitrate, 0x100000) + 0x100000;
unk = ((s32(total_bitrate) >> 0x14) + u32(s32(total_bitrate) < 0 && (total_bitrate & 0xfffff) != 0)) * 0x100000 + 0x100000;
} }
settings.video_stream_sharing = init_param->video_param.video_stream_sharing; settings.video_stream_sharing = init_param->video_param.video_stream_sharing;
settings.unk = unk; settings.total_video_bitrate = total_bitrate;
break; break;
} }
default: default: