i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multi_audio: Replace old buffer infos with old cycle numbers.

Browse Source 
The old buffer info was not initialized so would possibly contain bogus
initial content.

Since the introduction of the TimeComputer, the old buffer info was not
used to update the timesource data and the only remaining use was for
keeping track of the previous cycle number.

Replace the old buffer info by just the old cycle number and initialize
that.

Change-Id: I8be5a17f086a9f81f9b8fd0629e10460518f3d8c
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3111
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Michael Lotz
2020-07-31 23:36:55 +00:00
committed by waddlesplash
parent 24cc0d5a4a
commit c7c0cf726e
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
+11 -12
View File
@@ -46,7 +46,7 @@ public:
media_format fPreferredFormat;
media_format fFormat;
volatile uint32 fBufferCycle;
multi_buffer_info fOldBufferInfo;
int32 fOldBufferCycle;
BBuffer* fBuffer;
Resampler *fResampler;
};
@@ -67,7 +67,7 @@ public:
bool fOutputEnabled;
uint64 fSamplesSent;
volatile uint32 fBufferCycle;
multi_buffer_info fOldBufferInfo;
int32 fOldBufferCycle;
Resampler* fResampler;
};
@@ -131,6 +131,7 @@ node_input::node_input(media_input& input, media_format format)
fInput = input;
fPreferredFormat = format;
fBufferCycle = 1;
fOldBufferCycle = -1;
fBuffer = NULL;
fResampler = NULL;
}
@@ -154,6 +155,7 @@ node_output::node_output(media_output& output, media_format format)
fOutput = output;
fPreferredFormat = format;
fBufferCycle = 1;
fOldBufferCycle = -1;
fResampler = NULL;
}
@@ -1837,8 +1839,7 @@ MultiAudioNode::_OutputThread()
if (bufferInfo.playback_buffer_cycle >= 0
&& bufferInfo.playback_buffer_cycle
< fDevice->BufferList().return_playback_buffers
&& (input->fOldBufferInfo.playback_buffer_cycle
!= bufferInfo.playback_buffer_cycle
&& (input->fOldBufferCycle != bufferInfo.playback_buffer_cycle
|| fDevice->BufferList().return_playback_buffers == 1)
&& (input->fInput.source != media_source::null
|| input->fChannelId == 0)) {
@@ -1851,11 +1852,10 @@ MultiAudioNode::_OutputThread()
// update the timesource
if (input->fChannelId == 0) {
//PRINT(("updating timesource\n"));
_UpdateTimeSource(bufferInfo, input->fOldBufferInfo,
*input);
_UpdateTimeSource(bufferInfo, *input);
}
input->fOldBufferInfo = bufferInfo;
input->fOldBufferCycle = bufferInfo.playback_buffer_cycle;
if (input->fBuffer != NULL) {
_FillNextBuffer(*input, input->fBuffer);
@@ -1889,7 +1889,7 @@ MultiAudioNode::_OutputThread()
if (bufferInfo.record_buffer_cycle >= 0
&& bufferInfo.record_buffer_cycle
< fDevice->BufferList().return_record_buffers
&& (output->fOldBufferInfo.record_buffer_cycle
&& (output->fOldBufferCycle
!= bufferInfo.record_buffer_cycle
|| fDevice->BufferList().return_record_buffers == 1)) {
//PRINT(("record_buffer_cycle ok\n"));
@@ -1919,7 +1919,7 @@ MultiAudioNode::_OutputThread()
}
}
output->fOldBufferInfo = bufferInfo;
output->fOldBufferCycle = bufferInfo.record_buffer_cycle;
} else {
//PRINT(("record_buffer_cycle non ok\n"));
}
@@ -2119,11 +2119,10 @@ MultiAudioNode::_AllocateBuffers(node_output &channel)
void
MultiAudioNode::_UpdateTimeSource(multi_buffer_info& info,
multi_buffer_info& oldInfo, node_input& input)
MultiAudioNode::_UpdateTimeSource(multi_buffer_info& info, node_input& input)
{
//CALLED();
if (!fTimeSourceStarted || oldInfo.played_real_time == 0)
if (!fTimeSourceStarted)
return;
fTimeComputer.AddTimeStamp(info.played_real_time,
src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.h
-1
View File
@@ -211,7 +211,6 @@ private:
BBuffer* _FillNextBuffer(multi_buffer_info& info,
node_output& output);
void _UpdateTimeSource(multi_buffer_info& info,
multi_buffer_info& oldInfo,
node_input& input);
node_output* _FindOutput(media_source source);