Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3563 from unknownbrackets/audio-minor

Browse source 
More error handling in sas, bitrate info fix in mp3
This commit is contained in:
Henrik Rydgård 2013-09-02 07:40:16 -07:00
commit a7e00568b7
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/HLE/sceMp3.cpp
View file

@ -380,7 +380,7 @@ int sceMp3Init(u32 mp3) {
ctx->mp3SamplingRate = ctx->decoder_context->sample_rate;
ctx->mp3Channels = ctx->decoder_context->channels;
ctx->mp3Bitrate = ctx->decoder_context->bit_rate;
ctx->mp3Bitrate = ctx->decoder_context->bit_rate / 1000;
if (!ctx->resampler_context) {
ERROR_LOG(HLE, "Could not allocate resampler context %d", ret);

4
Core/HLE/sceSas.cpp
View file

@ -86,6 +86,10 @@ u32 sceSasInit(u32 core, u32 grainSize, u32 maxVoices, u32 outputMode, u32 sampl
ERROR_LOG_REPORT(HLE, "sceSasInit(%08x, %i, %i, %i, %i): bad output mode", core, grainSize, maxVoices, outputMode, sampleRate);
return ERROR_SAS_INVALID_OUTPUT_MODE;
}
if (sampleRate != 44100) {
ERROR_LOG_REPORT(HLE, "sceSasInit(%08x, %i, %i, %i, %i): bad sample rate", core, grainSize, maxVoices, outputMode, sampleRate);
return ERROR_SAS_INVALID_SAMPLE_RATE;
}
INFO_LOG(HLE, "sceSasInit(%08x, %i, %i, %i, %i)", core, grainSize, maxVoices, outputMode, sampleRate);
sas->SetGrainSize(grainSize);

4
Core/HW/SasAudio.h
View file

@ -66,11 +66,11 @@ struct WaveformEffect
enum VoiceType {
VOICETYPE_OFF,
VOICETYPE_VAG, // default
VOICETYPE_PCM,
VOICETYPE_NOISE,
VOICETYPE_ATRAC3,
VOICETYPE_TRIWAVE, // are these used? there are functions for them (sceSetTriangularWave)
VOICETYPE_PULSEWAVE,
VOICETYPE_PCM,
VOICETYPE_ATRAC3,
};
// VAG is a Sony ADPCM audio compression format, which goes all the way back to the PSX.

2
pspautotests

@ -1 +1 @@
Subproject commit 30e70f0630542155cbc8ccf3508929be9a1d98d4
Subproject commit dfb1451c490bc9c7b8286f2f1fea69ced66a8327

4
test.py
View file

@ -69,6 +69,8 @@ tests_good = [
"cpu/fpu/fpu",
"audio/atrac/ids",
"audio/mp3/mp3test",
"audio/sascore/sascore",
"ctrl/ctrl",
"ctrl/idle/idle",
"ctrl/sampling/sampling",
@ -185,8 +187,6 @@ tests_good = [
tests_next = [
# These are the next tests up for fixing. These run by default.
"audio/atrac/atractest",
"audio/mp3/mp3test",
"audio/sascore/sascore",
"audio/sceaudio/datalen",
"audio/sceaudio/output",
"audio/sceaudio/reserve",