From f56ec0c6435b25d825a0816aedc12f4abac97e80 Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Fri, 16 Aug 2024 15:04:05 -0300 Subject: [PATCH] error --- src/core/libraries/error_codes.h | 16 ++-------------- src/core/libraries/videoout/video_out.cpp | 4 ++-- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/core/libraries/error_codes.h b/src/core/libraries/error_codes.h index e2ab7bbf9..3c3604a27 100644 --- a/src/core/libraries/error_codes.h +++ b/src/core/libraries/error_codes.h @@ -749,19 +749,6 @@ constexpr int ORBIS_TROPHY_STORAGE_ERROR_TITLE_DATA_BROKEN = 0x8055951a; constexpr int ORBIS_TROPHY_STORAGE_ERROR_UNKNOWN = 0x80559500; // 2153092352 constexpr int ORBIS_TROPHY_STORAGE_ERROR_UNSUPPORTED_DB_SCHEMA = 0x8055950b; // 2153092363 -// AvPlayer library -constexpr int ORBIS_AVPLAYER_ERROR_INVALID_PARAMS = 0x806A0001; -constexpr int ORBIS_AVPLAYER_ERROR_OPERATION_FAILED = 0x806A0002; -constexpr int ORBIS_AVPLAYER_ERROR_NO_MEMORY = 0x806A0003; -constexpr int ORBIS_AVPLAYER_ERROR_NOT_SUPPORTED = 0x806A0004; -constexpr int ORBIS_AVPLAYER_ERROR_WAR_FILE_NONINTERLEAVED = 0x806A00A0; -constexpr int ORBIS_AVPLAYER_ERROR_WAR_LOOPING_BACK = 0x806A00A1; -constexpr int ORBIS_AVPLAYER_ERROR_WAR_JUMP_COMPLETE = 0x806A00A3; -constexpr int ORBIS_AVPLAYER_ERROR_INFO_MARLIN_ENCRY = 0x806A00B0; -constexpr int ORBIS_AVPLAYER_ERROR_INFO_PLAYREADY_ENCRY = 0x806A00B4; -constexpr int ORBIS_AVPLAYER_ERROR_INFO_AES_ENCRY = 0x806A00B5; -constexpr int ORBIS_AVPLAYER_ERROR_INFO_OTHER_ENCRY = 0x806A00BF; - // AppContent library constexpr int ORBIS_APP_CONTENT_ERROR_BUSY = 0x80d90003; // 2161704963 constexpr int ORBIS_APP_CONTENT_ERROR_CREATE_FULL = 0x80d9000e; // 2161704974 @@ -6570,7 +6557,7 @@ constexpr int ORBIS_AJM_ERROR_RETRY = 0x80930010; // 21571174 constexpr int ORBIS_AJM_ERROR_UNKNOWN = 0x80930001; // 2157117441 constexpr int ORBIS_AJM_ERROR_WRONG_REVISION_FLAG = 0x8093000b; // 2157117451 -// AV +// AvPlayer library constexpr int ORBIS_AV_CONTROL_ERROR_BLANK_TIMEOUT = 0x802a0006; // 2150236166 constexpr int ORBIS_AV_CONTROL_ERROR_DP_LINK_TRAINING_FAIL = 0x802a0005; // 2150236165 constexpr int ORBIS_AV_CONTROL_ERROR_INIT_FAIL = 0x802a0007; // 2150236167 @@ -6605,6 +6592,7 @@ constexpr int ORBIS_AVPLAYER_ERROR_NOT_SUPPORTED = 0x806a0004; constexpr int ORBIS_AVPLAYER_ERROR_OPERATION_FAILED = 0x806a0002; // 2154430466 constexpr int ORBIS_AVPLAYER_ERROR_WAR_FILE_NONINTERLEAVED = 0x806a00a0; // 2154430624 constexpr int ORBIS_AVPLAYER_ERROR_WAR_LOOPING_BACK = 0x806a00a1; // 2154430625 +constexpr int ORBIS_AVPLAYER_ERROR_WAR_JUMP_COMPLETE = 0x806A00A3; // 2154430627 // BT constexpr int ORBIS_BT_ERROR_ACL_TX_BUF_OVERFLOW = 0x802f0b03; // 2150566659 diff --git a/src/core/libraries/videoout/video_out.cpp b/src/core/libraries/videoout/video_out.cpp index 564041a19..00ad9f0a5 100644 --- a/src/core/libraries/videoout/video_out.cpp +++ b/src/core/libraries/videoout/video_out.cpp @@ -153,7 +153,7 @@ s32 PS4_SYSV_ABI sceVideoOutSubmitFlip(s32 handle, s32 bufferIndex, s32 flipMode int PS4_SYSV_ABI sceVideoOutGetEventId(const Kernel::SceKernelEvent* ev) { if (ev == nullptr) { - return SCE_VIDEO_OUT_ERROR_INVALID_ADDRESS; + return ORBIS_VIDEO_OUT_ERROR_INVALID_ADDRESS; } if (ev->filter != Kernel::SceKernelEvent::Filter::VideoOut) { return ORBIS_VIDEO_OUT_ERROR_INVALID_EVENT_QUEUE; @@ -163,7 +163,7 @@ int PS4_SYSV_ABI sceVideoOutGetEventId(const Kernel::SceKernelEvent* ev) { int PS4_SYSV_ABI sceVideoOutGetEventData(const Kernel::SceKernelEvent* ev, int64_t* data) { if (ev == nullptr || data == nullptr) { - return SCE_VIDEO_OUT_ERROR_INVALID_ADDRESS; + return ORBIS_VIDEO_OUT_ERROR_INVALID_ADDRESS; } if (ev->filter != Kernel::SceKernelEvent::Filter::VideoOut) { return ORBIS_VIDEO_OUT_ERROR_INVALID_EVENT_QUEUE;