Ticket #3356: rudolf_drift.patch

src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp

@@ -1467 +1467 @@
     bufferInfo.playback_buffer_cycle = 0;
     bufferInfo.record_buffer_cycle = 0;
 
+//rudolf:>>>
+//OSS:
+    int64 bytesWritten = 0;
+    bigtime_t lastRealTime = RealTime();
+    bigtime_t lastPerformanceTime = 0;
+    
+    const int32 driftValueCount = 64;
+    int32 currentDriftValueIndex = 0;
+    float driftValues[driftValueCount];
+    for (int32 i = 0; i < driftValueCount; i++)
+        driftValues[i] = 1.0;
+
+//end rudolf.<<<<
+
     while (true) {
         // TODO: why this semaphore??
         if (acquire_sem_etc(fBufferFreeSem, 1, B_RELATIVE_TIMEOUT, 0)
@@ -1501 +1515 @@
 
                 // update the timesource
                 if (input->fChannelId == 0) {
+//rudolf:>>>>>
+//orig:
                     //PRINT(("updating timesource\n"));
-                    _UpdateTimeSource(bufferInfo, input->fOldBufferInfo,
-                        *input);
+//                  _UpdateTimeSource(bufferInfo, input->fOldBufferInfo,
+//                      *input);
+
+//rud: OSS multi-audio node:
+
+
+        // update the timesource
+//orig OSS:
+    //  if (input->fEngineIndex == 0 && input->fThread >= 0) {
+
+            bigtime_t realTime = RealTime();
+            bigtime_t realPlaybackDuration = realTime - lastRealTime;
+//          bigtime_t performanceTime
+//              = time_for_buffer(bytesWritten, input->fInput.format);
+//this is orig hmulti: is same as above from OSS.
+    bigtime_t performanceTime = (bigtime_t)(bufferInfo.played_frames_count / 
+        input->fInput.format.u.raw_audio.frame_rate * 1000000LL);
+
+
+            float drift = (double)(performanceTime
+                - lastPerformanceTime) / realPlaybackDuration;
+//drift = 1.0;
+            lastPerformanceTime = performanceTime;
+            lastRealTime = realTime;
+
+            driftValues[currentDriftValueIndex++] = drift;
+            if (currentDriftValueIndex == driftValueCount)
+                currentDriftValueIndex = 0;
+
+            drift = 0.0;
+            for (int32 i = 0; i < driftValueCount; i++)
+                drift += driftValues[i];
+            drift /= driftValueCount;
+
+//orig OSS:
+//          if (fDevice->Locker()->Lock()) {
+//              if (input->fThread >= 0)
+                if (input->fChannelId == 0)
+                    PublishTime(performanceTime, realTime, drift);
+//orig OSS:
+//              fDevice->Locker()->Unlock();
+//          }
+    //  }
+//end rudolf<<<<<<
+
+
+//orig hmulti:
+
+//  bigtime_t performanceTime = (bigtime_t)(info.played_frames_count / 
+//      input.fInput.format.u.raw_audio.frame_rate * 1000000LL);
+//  bigtime_t realTime = info.played_real_time;
+//  float drift = ((info.played_frames_count - oldInfo.played_frames_count)
+//      / input.fInput.format.u.raw_audio.frame_rate * 1000000LL)
+//      / (info.played_real_time - oldInfo.played_real_time);
+
+//  PublishTime(performanceTime, realTime, drift);
+
+//end orig hmulti.
                 }
 
                 input->fOldBufferInfo = bufferInfo;
@@ -1549 +1621 @@
                     // Get the next buffer of data
                     BBuffer* buffer = _FillNextBuffer(bufferInfo, *output);
                     if (buffer != NULL) {
+
+//rudolf (from OSS)
+                        bytesWritten += buffer->SizeUsed();
+
                         // send the buffer downstream if and only if output is
                         // enabled
                         status_t err = B_ERROR;