chris/Cog
2
1
Fork 0
Code Issues 64 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: chris:1bea1699a1b1785b1ee3d04ac83ae1fe93d5678f
Branches Tags
chris:main
chris:wip.tahoe
chris:sparkle
chris:emusc
chris:projectm
chris:update-vgmstream
chris:xcode15
chris:lastfm
chris:swiftingly
chris:CQTexperiment
chris:k54
chris:r516
..
compare: chris:46ee7fc8b9921954b369f8ca528f7553c0d9ef01
Branches Tags
chris:wip.tahoe
chris:main
chris:sparkle
chris:emusc
chris:projectm
chris:update-vgmstream
chris:xcode15
chris:lastfm
chris:swiftingly
chris:CQTexperiment
chris:k54
chris:r516

No commits in common. "1bea1699a1b1785b1ee3d04ac83ae1fe93d5678f" and "46ee7fc8b9921954b369f8ca528f7553c0d9ef01" have entirely different histories.
1bea1699a1 ... 46ee7fc8b9

2 changed files with 16 additions and 13 deletions
Show stats Expand all files Collapse all files

16
Audio/Chain/ChunkList.m
View file

@ -837,18 +837,10 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
if(hdcd_decoder) { // implied bits per sample is 16, produces 32 bit int scale
samplesRead = bytesReadFromInput / 2;
const size_t buffer_adder = (inputBuffer == &tempData[0]) ? buffer_adder_base : 0;
if(isUnsigned) {
if(!inputChanged) {
memcpy(&tempData[buffer_adder], inputBuffer, samplesRead * 2);
inputBuffer = &tempData[buffer_adder];
inputChanged = YES;
}
if(isUnsigned)
convert_u16_to_s16((int16_t *)inputBuffer, samplesRead);
isUnsigned = NO;
}
const size_t buffer_adder2 = (inputBuffer == &tempData[0]) ? buffer_adder_base : 0;
convert_s16_to_hdcd_input((int32_t *)(&tempData[buffer_adder2]), (int16_t *)inputBuffer, samplesRead);
hdcd_process_stereo((hdcd_state_stereo_t *)hdcd_decoder, (int32_t *)(&tempData[buffer_adder2]), (int)(samplesRead / 2));
convert_s16_to_hdcd_input((int32_t *)(&tempData[buffer_adder]), (int16_t *)inputBuffer, samplesRead);
hdcd_process_stereo((hdcd_state_stereo_t *)hdcd_decoder, (int32_t *)(&tempData[buffer_adder]), (int)(samplesRead / 2));
if(((hdcd_state_stereo_t *)hdcd_decoder)->channel[0].sustain &&
((hdcd_state_stereo_t *)hdcd_decoder)->channel[1].sustain) {
hdcdSustained = YES;
@ -858,7 +850,7 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
bitsPerSample = 32;
bytesReadFromInput = samplesRead * 4;
isUnsigned = NO;
inputBuffer = &tempData[buffer_adder2];
inputBuffer = &tempData[buffer_adder];
inputChanged = YES;
} else {
// Discard the output of the decoder and process again

13
Audio/Output/OutputCoreAudio.m
View file

@ -713,6 +713,17 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
}
double secondsRendered = (double)renderedSamples / format->mSampleRate;
float volumeScale = 1.0;
double sustained;
sustained = _self->secondsHdcdSustained;
if(sustained > 0) {
if(sustained < secondsRendered) {
_self->secondsHdcdSustained = 0.0;
} else {
_self->secondsHdcdSustained = sustained - secondsRendered;
volumeScale = 0.5;
}
}
[fadersLock lock];
for(size_t i = 0; i < [faders count];) {
@ -726,7 +737,7 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
}
[fadersLock unlock];
scale_by_volume(outSamples, frameCount * channels, _self->volume);
scale_by_volume(outSamples, frameCount * channels, volumeScale * _self->volume);
[_self updateLatency:secondsRendered];