Unrelated logging improvement

This commit is contained in:
Henrik Rydgård 2025-01-03 21:14:22 +01:00
parent 74817c779d
commit 083543cc14
2 changed files with 7 additions and 5 deletions

View file

@ -945,7 +945,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) {
}
}
if (!found) {
ERROR_LOG_REPORT(Log::ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->GetTrack().BytesPerFrame(), atrac->GetTrack().channels);
WARN_LOG_REPORT_ONCE(at3headermap, Log::ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->GetTrack().BytesPerFrame(), atrac->GetTrack().channels);
// TODO: Should we return an error code for these values?
}
}

View file

@ -577,13 +577,15 @@ static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb,
GainBlock *gain2 = &snd->gain_block[1 - snd->gc_blk_switch];
if (coding_mode == JOINT_STEREO && channel_num == 1) {
if (get_bits(gb, 2) != 3) {
av_log(AV_LOG_ERROR,"JS mono Sound Unit id != 3.");
int bits = get_bits(gb, 2);
if (bits != 3) {
av_log(AV_LOG_ERROR,"Joint Stereo mono Sound Unit id %d != 3.", bits);
return AVERROR_INVALIDDATA;
}
} else {
if (get_bits(gb, 6) != 0x28) {
av_log(AV_LOG_ERROR,"Sound Unit id != 0x28.");
int bits = get_bits(gb, 6);
if (bits != 0x28) {
av_log(AV_LOG_ERROR, "Sound Unit id %02x != 0x28.", bits);
return AVERROR_INVALIDDATA;
}
}