[haiku-commits] r34683 - haiku/trunk/src/add-ons/media/media-add-ons/multi_audio

From: ingo_weinhold@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 16 Dec 2009 21:13:14 +0100 (CET)
Author: bonefish
Date: 2009-12-16 21:13:14 +0100 (Wed, 16 Dec 2009)
New Revision: 34683
Changeset: http://dev.haiku-os.org/changeset/34683/haiku

Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.h
Log:
* Use TimeComputer to get smoother performance times.
* SetParameterValue(): Don't do anything, if the new output frequency value
  is the same as before. This avoids hickups when switching between the pages
  in the Media preflet.
* _FillNextBuffer(): Compare BBuffer and stream buffer size. They might
  differ directly after setting another output frequency, which could cause
  a crash.


Modified: 
haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp  
2009-12-16 20:04:58 UTC (rev 34682)
+++ haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp  
2009-12-16 20:13:14 UTC (rev 34683)
@@ -1408,6 +1408,9 @@
                        return;
                memcpy(&rate, value, sizeof(rate));
 
+               if (rate == fOutputPreferredFormat.u.raw_audio.frame_rate)
+                       return;
+
                // create a cookie RequestCompleted() can get the old frame 
rate from,
                // if anything goes wrong
                OutputFrameRateChangeCookie* cookie
@@ -1665,8 +1668,12 @@
        bufferInfo.playback_buffer_cycle = 0;
        bufferInfo.record_buffer_cycle = 0;
 
-       // reset the info for the performance time computation
-       fResetPerformanceTimeBase = true;
+       // init the performance time computation
+       {
+               BAutolock locker(fBufferLock);
+               
fTimeComputer.Init(fOutputPreferredFormat.u.raw_audio.frame_rate,
+                       system_time());
+       }
 
        while (true) {
                // TODO: why this semaphore??
@@ -1862,6 +1869,14 @@
 
        uint32 bufferSize = fDevice->BufferList().return_playback_buffer_size;
 
+       if (buffer->SizeUsed()
+               / (input.fInput.format.u.raw_audio.format
+                       & media_raw_audio_format::B_AUDIO_SIZE_MASK)
+               / input.fInput.format.u.raw_audio.channel_count != bufferSize) {
+               _WriteZeros(input, input.fBufferCycle);
+               return;
+       }
+
        switch (input.fInput.format.u.raw_audio.format) {
                case media_raw_audio_format::B_AUDIO_FLOAT:
                        switch (input.fFormat.u.raw_audio.format) {
@@ -2128,27 +2143,9 @@
        if (!fTimeSourceStarted || oldInfo.played_real_time == 0)
                return;
 
-       if (fResetPerformanceTimeBase) {
-               fPerformanceTimeBase = info.played_real_time;
-               fPerformanceTimeBaseFrames = info.played_frames_count;
-               fResetPerformanceTimeBase = false;
-               return;
-       }
-
-       double usecsPerFrame = 1000000 / 
input.fInput.format.u.raw_audio.frame_rate;
-       uint64 frameCount = info.played_frames_count
-               - fPerformanceTimeBaseFrames;
-       uint64 oldFrameCount = oldInfo.played_frames_count
-               - fPerformanceTimeBaseFrames;
-
-       bigtime_t performanceTime = (bigtime_t)(frameCount * usecsPerFrame)
-               + fPerformanceTimeBase;
-       bigtime_t realTime = info.played_real_time;
-       float drift = ((frameCount - oldFrameCount) * usecsPerFrame)
-               / (info.played_real_time - oldInfo.played_real_time);
-
-       PublishTime(performanceTime, realTime, drift);
-       //PRINT(("_UpdateTimeSource() perf_time : %lli, real_time : %lli, drift 
: %f\n", performanceTime, realTime, drift));
+       fTimeComputer.AddTimeStamp(info.played_real_time, 
info.played_frames_count);
+       PublishTime(fTimeComputer.PerformanceTime(), fTimeComputer.RealTime(),
+               fTimeComputer.Drift());
 }
 
 
@@ -2351,7 +2348,7 @@
        }
 
        // make sure the time base is reset
-       fResetPerformanceTimeBase = true;
+       fTimeComputer.SetFrameRate(frameRate);
 
        // update internal latency
        _UpdateInternalLatency(fOutputPreferredFormat);
@@ -2363,7 +2360,7 @@
 void
 MultiAudioNode::_UpdateInternalLatency(const media_format& format)
 {
-       // use one buffer length latency
+       // use half a buffer length latency
        fInternalLatency = format.u.raw_audio.buffer_size * 10000 / 2
                / ((format.u.raw_audio.format
                                & media_raw_audio_format::B_AUDIO_SIZE_MASK)

Modified: 
haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.h    
2009-12-16 20:04:58 UTC (rev 34682)
+++ haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.h    
2009-12-16 20:13:14 UTC (rev 34683)
@@ -19,7 +19,9 @@
 
 #include "hmulti_audio.h"
 #include "MultiAudioDevice.h"
+#include "TimeComputer.h"
 
+
 class BDiscreteParameter;
 class BParameterGroup;
 
@@ -205,9 +207,7 @@
        BLocker                         fBufferLock;
 
        BList                           fInputs;
-       bool                            fResetPerformanceTimeBase;
-       bigtime_t                       fPerformanceTimeBase;
-       uint64                          fPerformanceTimeBaseFrames;
+       TimeComputer            fTimeComputer;
 
        bigtime_t                       fLatency;
        BList                           fOutputs;
[haiku-commits] r34683 - haiku/trunk/src/add-ons/media/media-add-ons/multi_audio

Other related posts:
