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

Move channels into Track

Browse source
This commit is contained in:
Henrik Rydgård 2024-04-14 18:37:32 +02:00
parent 0a275883ec
commit 9d0dac5acb
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Core/HLE/AtracCtx.cpp
View file

@ -42,7 +42,7 @@ void Atrac::DoState(PointerWrap &p) {
if (!s)
return;
Do(p, channels_);
Do(p, track_.channels);
Do(p, outputChannels_);
if (s >= 5) {
Do(p, track_.jointStereo);
@ -175,7 +175,7 @@ void Atrac::AnalyzeReset() {
track_.loopEndSample = -1;
decodePos_ = 0;
bufferPos_ = 0;
channels_ = 2;
track_.channels = 2;
}
void Atrac::UpdateContextFromPSPMem() {
@ -215,7 +215,7 @@ void Atrac::WriteContextToPSPMem() {
context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
}
context->info.sampleSize = track_.bytesPerFrame;
context->info.numChan = channels_;
context->info.numChan = track_.channels;
context->info.dataOff = track_.dataOff;
context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra();
context->info.dataEnd = track_.fileSize;
@ -324,9 +324,9 @@ int Atrac::Analyze(u32 addr, u32 size) {
else {
return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid fmt magic: %04x", at3fmt->fmtTag);
}
channels_ = at3fmt->channels;
if (channels_ != 1 && channels_ != 2) {
return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid channel count: %d", channels_);
track->channels = at3fmt->channels;
if (track->channels != 1 && track->channels != 2) {
return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid channel count: %d", track->channels);
}
if (at3fmt->samplerate != 44100) {
return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unsupported sample rate: %d", at3fmt->samplerate);
@ -479,14 +479,14 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) {
track->codecType = PSP_MODE_AT_3;
track->bytesPerFrame = (codecParams & 0x03FF) * 8;
track->bitrate = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 1024;
channels_ = 2;
track->channels = 2;
track->jointStereo = (codecParams >> 17) & 1;
break;
case 1:
track->codecType = PSP_MODE_AT_3_PLUS;
track->bytesPerFrame = ((codecParams & 0x03FF) * 8) + 8;
track->bitrate = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 2048;
channels_ = (codecParams >> 10) & 7;
track->channels = (codecParams >> 10) & 7;
break;
case 3:
case 4:
@ -569,13 +569,13 @@ void Atrac::CreateDecoder() {
uint8_t extraData[14]{};
// The only thing that changes are the jointStereo_ values.
extraData[0] = 1;
extraData[3] = channels_ << 3;
extraData[3] = track_.channels << 3;
extraData[6] = track_.jointStereo;
extraData[8] = track_.jointStereo;
extraData[10] = 1;
decoder_ = CreateAtrac3Audio(channels_, track_.bytesPerFrame, extraData, sizeof(extraData));
decoder_ = CreateAtrac3Audio(track_.channels, track_.bytesPerFrame, extraData, sizeof(extraData));
} else {
decoder_ = CreateAtrac3PlusAudio(channels_, track_.bytesPerFrame);
decoder_ = CreateAtrac3PlusAudio(track_.channels, track_.bytesPerFrame);
}
// reinit decodePos, because ffmpeg had changed it.
decodePos_ = 0;
@ -671,7 +671,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) {
}
const char *codecName = track_.codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+";
const char *channelName = channels_ == 1 ? "mono" : "stereo";
const char *channelName = track_.channels == 1 ? "mono" : "stereo";
// Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are
// bugs in the decoder. This happens, see issue #15788. Arbitrary, but let's make it a whole page on the popular
@ -1085,7 +1085,7 @@ u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrit
}
void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) {
channels_ = Memory::Read_U32(paramsAddr);
track_.channels = Memory::Read_U32(paramsAddr);
outputChannels_ = Memory::Read_U32(paramsAddr + 4);
bufferMaxSize_ = Memory::Read_U32(paramsAddr + 8);
track_.bytesPerFrame = bufferMaxSize_;

4
Core/HLE/AtracCtx.h
View file

@ -116,6 +116,7 @@ struct Track {
int dataOff = 0;
u32 bitrate = 64;
int jointStereo = 0;
u16 channels = 0;
std::vector<AtracLoopInfo> loopinfo;
int loopStartSample = -1;
@ -184,7 +185,7 @@ struct Atrac {
return track_.bitrate;
}
int Channels() const {
return channels_;
return track_.channels;
}
int RemainingFrames() const;
@ -195,7 +196,6 @@ struct Atrac {
u32 decodePos_ = 0;
int atracID_ = -1;
u16 channels_ = 0;
u16 outputChannels_ = 2;
int currentSample_ = 0;

10
Core/HLE/sceAtrac.cpp
View file

@ -765,7 +765,7 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u
// Already logged.
return ret;
}
if (atrac->channels_ != 1) {
if (atrac->GetTrack().channels != 1) {
// It seems it still sets the data.
atrac->outputChannels_ = 2;
atrac->SetData(buffer, readSize, bufferSize);
@ -789,7 +789,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) {
// Already logged.
return ret;
}
if (atrac->channels_ != 1) {
if (atrac->GetTrack().channels != 1) {
// It seems it still sets the data.
atrac->outputChannels_ = 2;
atrac->SetData(buffer, bufferSize, bufferSize);
@ -809,7 +809,7 @@ static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) {
delete atrac;
return ret;
}
if (atrac->channels_ != 1) {
if (atrac->GetTrack().channels != 1) {
delete atrac;
return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data");
}
@ -834,7 +834,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu
delete atrac;
return ret;
}
if (atrac->channels_ != 1) {
if (atrac->GetTrack().channels != 1) {
delete atrac;
return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data");
}
@ -937,7 +937,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) {
atrac->InitLowLevel(paramsAddr, jointStereo);
const char *codecName = atrac->track_.codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+";
const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo";
const char *channelName = atrac->GetTrack().channels == 1 ? "mono" : "stereo";
return hleLogSuccessInfoI(ME, 0, "%s %s audio", codecName, channelName);
}