Skip to content

Commit 24a19b6

Browse files
authored
Move rendering will start/complete logging (#714)
1 parent 5909925 commit 24a19b6

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Sources/CSFBAudioEngine/Player/AudioPlayer.mm

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,14 +1618,6 @@ bool PerformSeek() noexcept
16181618
const double deltaSeconds = frameOffset / audioRingBuffer_.Format().mSampleRate;
16191619
eventTime = renderHostTime + SFB::ConvertSecondsToHostTime(deltaSeconds * rateScalar);
16201620

1621-
const auto now = SFB::GetCurrentHostTime();
1622-
if(now > eventTime)
1623-
os_log_error(log_, "Rendering started event processed %.2f msec late for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(now - eventTime)) / 1e6, decoderState->decoder_);
1624-
#if DEBUG
1625-
else
1626-
os_log_debug(log_, "Rendering will start in %.2f msec for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(eventTime - now)) / 1e6, decoderState->decoder_);
1627-
#endif /* DEBUG */
1628-
16291621
startedDecoder = decoderState->decoder_;
16301622
}
16311623

@@ -1642,14 +1634,6 @@ bool PerformSeek() noexcept
16421634
const double deltaSeconds = frameOffset / audioRingBuffer_.Format().mSampleRate;
16431635
eventTime = renderHostTime + SFB::ConvertSecondsToHostTime(deltaSeconds * rateScalar);
16441636

1645-
const auto now = SFB::GetCurrentHostTime();
1646-
if(now > eventTime)
1647-
os_log_error(log_, "Rendering complete event processed %.2f msec late for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(now - eventTime)) / 1e6, decoderState->decoder_);
1648-
#if DEBUG
1649-
else
1650-
os_log_debug(log_, "Rendering will complete in %.2f msec for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(eventTime - now)) / 1e6, decoderState->decoder_);
1651-
#endif /* DEBUG */
1652-
16531637
if(!DeleteDecoderStateWithSequenceNumber(decoderState->sequenceNumber_))
16541638
os_log_error(log_, "Unable to delete decoder state with sequence number %llu in rendering complete event", decoderState->sequenceNumber_);
16551639
}
@@ -1665,6 +1649,14 @@ bool PerformSeek() noexcept
16651649

16661650
void SFB::AudioPlayer::HandleRenderingWillStartEvent(Decoder decoder, uint64_t hostTime) noexcept
16671651
{
1652+
const auto now = SFB::GetCurrentHostTime();
1653+
if(now > hostTime)
1654+
os_log_error(log_, "Rendering started event processed %.2f msec late for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(now - hostTime)) / 1e6, decoder);
1655+
#if DEBUG
1656+
else
1657+
os_log_debug(log_, "Rendering will start in %.2f msec for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(hostTime - now)) / 1e6, decoder);
1658+
#endif /* DEBUG */
1659+
16681660
// Schedule the rendering started notification at the expected host time
16691661
dispatch_after(hostTime, eventQueue_, ^{
16701662
if(NSNumber *isCanceled = objc_getAssociatedObject(decoder, &decoderIsCanceledKey); isCanceled.boolValue) {
@@ -1692,6 +1684,14 @@ bool PerformSeek() noexcept
16921684

16931685
void SFB::AudioPlayer::HandleRenderingWillCompleteEvent(Decoder _Nonnull decoder, uint64_t hostTime) noexcept
16941686
{
1687+
const auto now = SFB::GetCurrentHostTime();
1688+
if(now > hostTime)
1689+
os_log_error(log_, "Rendering complete event processed %.2f msec late for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(now - hostTime)) / 1e6, decoder);
1690+
#if DEBUG
1691+
else
1692+
os_log_debug(log_, "Rendering will complete in %.2f msec for %{public}@", static_cast<double>(SFB::ConvertHostTimeToNanoseconds(hostTime - now)) / 1e6, decoder);
1693+
#endif /* DEBUG */
1694+
16951695
// Schedule the rendering completed notification at the expected host time
16961696
dispatch_after(hostTime, eventQueue_, ^{
16971697
if(NSNumber *isCanceled = objc_getAssociatedObject(decoder, &decoderIsCanceledKey); isCanceled.boolValue) {

0 commit comments

Comments
 (0)