Changeset 533 for OCO/trunk/drv16/wavestrm.cpp

Timestamp:

Aug 2, 2010, 11:30:35 PM (15 years ago)

Author:

David Azarewicz

Message:

Fix for when u32 byte counter wraps

File:

• OCO/trunk/drv16/wavestrm.cpp (modified) (20 diffs)

OCO/trunk/drv16/wavestrm.cpp

@@ -55 +55 @@
 USHORT  WAVESTREAM::_vRealignBuffer(ULONG ulEndPos, PSTREAMBUFFER pBuffer)
 {
-        if (ulEndPos >= pBuffer->ulDonepos) { /* all of the data has been consumed */
+        if (ARG1_IS_AFTER_OR_EQUAL_TO_ARG2(ulEndPos, pBuffer->ulDonepos)) { /* all of the data has been consumed */
                 pBuffer->ulBuffpos = pBuffer->ulBuffsz;
                 pBuffer->ulDonepos = 0;
@@ -61 +61 @@
         }
 
-        if (ulEndPos >= (pBuffer->ulDonepos - pBuffer->ulBuffpos)) { /* some of the data has been consumed */
+        if (ARG1_IS_AFTER_OR_EQUAL_TO_ARG2(ulEndPos, (pBuffer->ulDonepos - pBuffer->ulBuffpos))) { /* some of the data has been consumed */
                 pBuffer->ulBuffpos = pBuffer->ulDonepos - ulEndPos;
                 pBuffer->ulBuffpos &= 0xFFFFFFFC; //keep it on a dword boundary
@@ -155 +155 @@
         fUnderrun = TRUE;
         _ulBytesProcessed = 0;
+        _ulLastPosition = 0;
         _ulBytesWritten = 0;
 }
@@ -175 +176 @@
 
         _ulBytesProcessed = 0;
+        _ulLastPosition = 0;
         _ulBytesWritten = 0;
         ulStreamState = STREAM_STREAMING;
@@ -298 +300 @@
 
         if (pahw->Transfer(StreamId, &_configinfo, pDataBuf, ulBuffLeft, &ulBytesWritten) == FALSE) {
-                // This could mean that the hardware has underrun TODO: implement underrun logic
+                // This could mean that the hardware has underrun
                 rprintf(("WS::AB: pahw->Transfer failed"));
                 return (ULONG)-1;
@@ -304 +306 @@
         //dprintf(("WS::AB: %lx of %lx bytes written", ulBytesWritten, ulBuffLeft));
         if (ulBytesWritten == 0) {
-                // This could mean that the hardware has underrun TODO: implement underrun logic
+                // This could mean that the hardware has underrun
                 //rprintf(("WS::AddBuffer: 0 of %lx bytes written by transfer", ulBuffLeft));
                 return (ULONG)-1;
@@ -322 +324 @@
         return ulBytesWritten;
 }
+
 //******************************************************************************
 // Read data from the audio Buffer.
@@ -363 +366 @@
         return TRUE;
 }
+
 //******************************************************************************
 // called by the irq function in the hardware object when we get an interrupt
@@ -377 +381 @@
                         {
                         PSTREAMBUFFER pTemp;
-                        ULONG   ulBytes;
+                        ULONG   ulBytes, ulDelta;
 
                         // get the stream position. if we get a bad rc or the position is 0
@@ -391 +395 @@
                                 return;
                         }
-                        _ulBytesProcessed = ulBytes;
+
+                        ulDelta = ulBytes - _ulLastPosition;
+                        if (ulBytes < _ulLastPosition) { /* the byte counter in uniaud32 has wrapped */
+                                ulDelta = ulBytes;
+                                if (_configinfo.ulBytesPerIRQ > ulDelta) ulDelta = _configinfo.ulBytesPerIRQ;
+                                rprintf(("u32 wrap: BytesProcessed=%lx LastPosition=%lx Bytes=%lx Delta=%lx InProcess=%lx Done=%lx",
+                                        _ulBytesProcessed, _ulLastPosition, ulBytes, ulDelta, qhInProcess.IsElements(), qhDone.IsElements()));
+                        }
+
+                        _ulBytesProcessed += ulDelta;
+                        _ulLastPosition = ulBytes;
 
                         if(!qhInProcess.IsElements() && !qhDone.IsElements()) {
@@ -407 +421 @@
                                 // done playing the stream
                                 if ((qhDone.Head() == qhDone.Tail()) && !qhInProcess.IsElements()) {  /* only one buffer left */
-                                        if (_ulBytesProcessed < pTemp->ulDonepos) break;
+                                        if (ARG1_IS_BEFORE_ARG2(_ulBytesProcessed, pTemp->ulDonepos)) break;
                                 } else { /* not the last buffer */
-                                        /* if the buffer is bigger than BytesPerIRQ and it's not finished yet, hang on to it */
-                                        if (!usBufferMode && (_ulBytesProcessed < pTemp->ulDonepos)) break;
-                                        //if ((_ulBytesProcessed + _configinfo.ulBytesPerIRQ) < pTemp->ulDonepos) break;
+                                        /* if uniaud32 is not done playing the data hang on to the buffer */
+                                        if (!usBufferMode && ARG1_IS_BEFORE_ARG2(_ulBytesProcessed, pTemp->ulDonepos)) break;
                                 }
                                 ReturnBuffer();
@@ -485 +498 @@
         ULONG Seconds, MilliSeconds, Overflow, Processed;
 
-        //PS++ optimize code
         Processed = _ulBytesProcessed;
-        if (ulStreamState == STREAM_STREAMING)  // if the stream is active
-        {
-           if (ulStreamType & STREAM_WRITE)
-           {
-                   if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
-                   {
-                                //DebugInt3();
-                                Processed = _ulBytesProcessed; //last known position
-                   }
+        if (ulStreamState == STREAM_STREAMING) {        // if the stream is active
+           if (ulStreamType & STREAM_WRITE) {
+                        if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE) {
+                                Processed = _ulBytesProcessed;
+                        }
                 }
         }
 
         // if we haven't processed anything then just return _ulTimeBase
-        if(Processed == 0)
-                return(_ulTimeBase);
+        if(Processed == 0) return(_ulTimeBase);
 
         Seconds  = Processed / _configinfo.ulPCMConsumeRate;
@@ -515 +522 @@
         ULONG Processed;
 
-        //PS++ optimize code
         Processed = _ulBytesProcessed;
-        if (ulStreamState == STREAM_STREAMING)  // if the stream is active
-        {
-                if (ulStreamType & STREAM_WRITE)
-                {
-                        if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
-                        {
+        if (ulStreamState == STREAM_STREAMING) {        // if the stream is active
+                if (ulStreamType & STREAM_WRITE) {
+                        if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE) {
                                 DebugInt3();
                                 Processed = _ulBytesProcessed; //last known position
@@ -590 +593 @@
 
         _ulBytesProcessed = 0;
+        _ulLastPosition = 0;
         _ulBytesWritten = 0;
         fUnderrun = FALSE;
@@ -632 +636 @@
                 return NO_ERROR;
         }
+
         //silence wave stream before stopping it (removes clicks)
         if(ulStreamType == STREAM_WAVE_PLAY) {
@@ -652 +657 @@
         // DDCMD_ENABLE_EVENT the event time will get screwed up. rjj
         _ulBytesProcessed = 0;
+        _ulLastPosition = 0;
         _ulBytesWritten = 0;
         return NO_ERROR;
@@ -659 +665 @@
 ULONG  WAVESTREAM::PauseStream(PCONTROL_PARM pControl)
 {
-        ULONG ulEndPos;
+        //DAZ ULONG ulEndPos;
 
         if(ulStreamState == STREAM_PAUSED) {
@@ -668 +674 @@
         }
 
-        pahw->GetPosition(StreamId, &_configinfo, &ulEndPos);
+        //DAZ pahw->GetPosition(StreamId, &_configinfo, &ulEndPos);
         //silence wave stream before stopping it (removes clicks)
         pahw->SetVolume(StreamId, getMixerStreamId(), 0);
@@ -677 +683 @@
         dprintf(("WS::PauseStream %lx", StreamId));
 
-        _ulBytesProcessed = ulEndPos;
-
-        _vRealignPausedBuffers(ulEndPos);
+        //DAZ _ulBytesProcessed = ulEndPos;
+
+        _vRealignPausedBuffers(_ulBytesProcessed);
 
         pControl->ulTime = GetCurrentTime();
 
         _ulBytesProcessed = 0;
+        _ulLastPosition = 0;
         _ulBytesWritten = 0;
         fUnderrun = FALSE;
@@ -755 +762 @@
         _ulBytesWritten                         = 0;
         _ulBytesProcessed                       = 0;
+        _ulLastPosition                         = 0;
         _ulTimeBase                             = 0;
         ulSavedInputGain                        = 0;