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

HLE: improve log messages in cellMusic and cellSearch #11547

Merged
merged 3 commits into from Feb 19, 2022
Merged

HLE: improve log messages in cellMusic and cellSearch #11547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af6bd14
cellMusic: fix cellMusicSetVolume log messages
Megamouse Feb 16, 2022
18ae63e
cellSearch: silence irrelevant log error
Megamouse Feb 16, 2022
373fb1f
cellSearch: log audio and video metadata
Megamouse Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions rpcs3/Emu/Cell/Modules/cellMusic.cpp
View file
Open in desktop
Expand Up @@ -102,7 +102,7 @@ error_code cellMusicSetSelectionContext2(vm::ptr<CellMusicSelectionContext> cont

error_code cellMusicSetVolume2(f32 level)
{
cellMusic.todo("cellMusicSetVolume2(level=0x%x)", level);
cellMusic.todo("cellMusicSetVolume2(level=%f)", level);

level = std::clamp(level, 0.0f, 1.0f);

Expand Down Expand Up @@ -421,7 +421,7 @@ error_code cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr<CellMusic2Cal

error_code cellMusicSetVolume(f32 level)
{
cellMusic.todo("cellMusicSetVolume(level=0x%x)", level);
cellMusic.todo("cellMusicSetVolume(level=%f)", level);

level = std::clamp(level, 0.0f, 1.0f);

Expand Down
19 changes: 17 additions & 2 deletions rpcs3/Emu/Cell/Modules/cellSearch.cpp
View file
Open in desktop
Expand Up @@ -199,9 +199,12 @@ void populate_music_info(CellSearchMusicInfo& info, const utils::media_info& mi,
// Special case: track is usually stored as e.g. 2/11
const std::string tmp = mi.get_metadata<std::string>("track", ""s);
s64 value{};
const bool success = try_to_int64(&value, tmp.substr(0, tmp.find('/')).c_str(), s32{smin}, s32{smax});
info.trackNumber = success ? static_cast<s32>(value) : -1;
if (tmp.empty() || !try_to_int64(&value, tmp.substr(0, tmp.find('/')).c_str(), s32{smin}, s32{smax}))
{
value = -1;
}

info.trackNumber = static_cast<s32>(value);
info.size = item.size;
info.releasedYear = static_cast<s32>(mi.get_metadata<s64>("date", -1));
info.duration = mi.duration_us / 1000; // we need microseconds
Expand Down Expand Up @@ -255,6 +258,13 @@ void populate_music_info(CellSearchMusicInfo& info, const utils::media_info& mi,
info.status = CELL_SEARCH_CONTENTSTATUS_NOT_SUPPORTED;
break;
}

cellSearch.notice("CellSearchMusicInfo:\ntitle=%s\nalbumTitle=%s\nartistName=%s\ngenreName=%s\ndiskNumber=%s\n"
"trackNumber=%d\nduration=%d\nsize=%d\nimportedDate=%d\nlastPlayedDate=%d\nreleasedYear=%d\nbitrate=%d\n"
"samplingRate=%d\nquantizationBitrate=%d\nplayCount=%d\ndrmEncrypted=%d\ncodec=%d\nstatus=%d)",
info.title, info.albumTitle, info.artistName, info.genreName, info.diskNumber,
info.trackNumber, info.duration, info.size, info.importedDate, info.lastPlayedDate, info.releasedYear, info.bitrate,
info.samplingRate, info.quantizationBitrate, info.playCount, info.drmEncrypted, info.codec, info.status);
}

void populate_video_info(CellSearchVideoInfo& info, const utils::media_info& mi, const fs::dir_entry& item)
Expand Down Expand Up @@ -353,6 +363,11 @@ void populate_video_info(CellSearchVideoInfo& info, const utils::media_info& mi,
info.status = CELL_SEARCH_CONTENTSTATUS_NOT_SUPPORTED;
break;
}

cellSearch.notice("CellSearchVideoInfo:\ntitle=%s\nalbumTitle=%s\nduration=%d\nsize=%d\nimportedDate=%d\takenDate=%d\n"
"videoBitrate=%d\audioBitrate=%d\nplayCount=%d\ndrmEncrypted=%d\nvideoCodec=%d\naudioCodec=%d\nstatus=%d)",
info.title, info.albumTitle, info.duration, info.size, info.importedDate, info.takenDate,
info.videoBitrate, info.audioBitrate, info.playCount, info.drmEncrypted, info.videoCodec, info.audioCodec, info.status);
}

error_code cellSearchInitialize(CellSearchMode mode, u32 container, vm::ptr<CellSearchSystemCallback> func, vm::ptr<void> userData)
Expand Down