Changeset 271

Timestamp:

Nov 19, 2007, 8:44:17 AM (18 years ago)

Author:

Brendan Oakley

Message:

Pavel's work on Uniaud16 to improve HDA

Location:

OCO/trunk/drv16

Files:

• convert.h (modified) (1 diff)
• waudio.cpp (modified) (3 diffs)
• waveplay.cpp (modified) (10 diffs)

OCO/trunk/drv16/convert.h

@@ -3 +3 @@
 
 //Use one page to temporarily hold converted wave data
-#define CONVERSION_BUFFER_SIZE           (16384UL)
+#define CONVERSION_BUFFER_SIZE           (12288UL)
 #define CONVERSION_FACTOR(lshift,rshift) (lshift << 8 | rshift)
 #define CONVERSION_LSHIFT(factor)        (factor >> 8)

OCO/trunk/drv16/waudio.cpp

@@ -1453 +1453 @@
     return newlen;
 }
+
+#define CONVERT_POSITION_INVERT(pos, ulFactor)  ( ( pos << CONVERSION_RSHIFT(ulFactor)) >> CONVERSION_LSHIFT(ulFactor) )
+#define CONVERT_LENGTH_INVERT(pos, ulFactor)    CONVERT_POSITION_INVERT(pos, ulFactor)
 //******************************************************************************
 //NOTE: Can only be used for small numbers (up to about 4mb)!! (overflow)
@@ -1458 +1461 @@
 ULONG WAVEAUDIO::ConvertLengthInvert(ULONG length, PWAVECONFIGINFO pConfigInfo) 
 {
-    ULONG newlen;
-
-    newlen = CONVERT_LENGTH(length, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
+    ULONG newlen,tmp,len;
+
+    if (!length) return 0;
+
+    len = length;
+
+    if (pConfigInfo->fSampleRateConversion)
+    {
+        tmp =  SRATE_CONVERT_LENGTH_INVERT(len, pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement);
+        if (tmp && (len != SRATE_CONVERT_LENGTH (tmp, pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement)))
+            tmp--;
+    }
+    else
+        tmp = len;
+
+    if (!tmp) return 0;
+    
+    if (pConfigInfo->usConversion != CONVERT_NONE) 
+    {
+        newlen =  CONVERT_LENGTH_INVERT (tmp, pConfigInfo->ulConversionFactor);
+        if (newlen && (tmp != CONVERT_LENGTH (newlen, pConfigInfo->ulConversionFactor)) )
+           newlen--;
+    }
+    else
+        newlen = tmp;
+
+   if ( newlen > length )
+       dprintf(("!!!!Back len %ld tmp %ld new %ld",length,tmp,newlen ));
 
     if(newlen >= 4UL*1024UL*1024UL) {
@@ -1467 +1495 @@
         return newlen;
     }
+/*PS++
     if(newlen && pConfigInfo->fSampleRateConversion) {
         newlen = SRATE_CONVERT_LENGTH_INVERT(newlen, pConfigInfo->ulSRatePosition, 
                                              pConfigInfo->ulSRateIncrement);
     }
+*/
     return newlen;
-
-}
-//******************************************************************************
-//******************************************************************************
-
+}
+//******************************************************************************
+//******************************************************************************
+

OCO/trunk/drv16/waveplay.cpp

@@ -46 +46 @@
 {
     ULONG open_strategy = 0UL;
+    ULONG LastSpace=0;
 //    int force_close(void);
 }
@@ -339 +340 @@
             if(ulBytesToTransfer & (pConfigInfo->ulSampleSize-1)) {
                 DebugInt3();
-                *pulBytesTransferred = *pulBytesTransferred & ~(pConfigInfo->ulSampleSize-1);
+                ulBytesToTransfer = ulBytesToTransfer & ~(pConfigInfo->ulSampleSize-1);
+#ifdef DEBUG
+                dprintf(("New ulBr %d" , ulBytesToTransfer));
+#endif
             }
             pConfigInfo->pfnConvert(pUserBuffer, ulBytesToTransfer, pConfigInfo->pConversionBuffer);
@@ -351 +355 @@
             if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1)) {
                 DebugInt3();
+#ifdef DEBUG
+                dprintf(("New pulBr %d" , pulBytesTransferred));
+#endif
             }
         }
@@ -366 +373 @@
                          ULONG ulBytesToTransfer, ULONG FAR *pulBytesTransferred)
 {
+    OSSRET rc;
+    ULONG  Space;
+    ULONG i;
 //    if (!waveOpened) return TRUE;
 
@@ -381 +391 @@
         ULONG  ulCvtBufferSize, ulSampleCount, ulHwSampleCount;
         LONG   lSRatePosition;
-        OSSRET rc;
 
         //bytes to convert is bounded by bytes to transfer & max conversion buffer size
@@ -402 +411 @@
         pConfigInfo->pfnSRateConv(pUserBuffer, ulCvtBufferSize, pConfigInfo->pSRateConvBuffer, 
                                   pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement);
-
+//PS++ !!!!! This don't be !!!!!!!
+        OSS16_WaveGetSpace(StreamId, &Space);
+        if (ulCvtBufferSize > Space)
+        {
+#ifdef DEBUG
+            dprintf(("WPLAY::AddBuffer need %ld space:%ld", ulCvtBufferSize, Space));
+#endif
+            for (i=0; i < 0xffffff; i++)
+            {
+                 OSS16_WaveGetSpace(StreamId, &Space);
+                 if (ulCvtBufferSize <= Space) break;
+            }
+#ifdef DEBUG
+            dprintf(("OUT %ld need %ld space:%ld Last:%ld",i, ulCvtBufferSize, Space,LastSpace));
+#endif
+        }
         if((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS ||
            *pulBytesTransferred == 0) 
         {
             if(rc == OSSERR_BUFFER_FULL) {
-                 dprintf2(("WAVEPLAY::AddBuffer; OSS16_WaveAddBuffer %lx %x failed due to full buffer", ulCvtBufferSize, (USHORT)rc));
+                 GetSpace(StreamId, pConfigInfo, &Space);
+                 dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
             }
-#ifdef DEBUG
-            else dprintf(("WAVEPLAY::AddBuffer; OSS16_WaveAddBuffer %lx %x failed", ulCvtBufferSize, (USHORT)rc));
-#endif /* DEBUG */
+            else dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
             *pulBytesTransferred = 0;
             return FALSE;
@@ -423 +446 @@
 
         //update sample rate position
-        lSRatePosition = (LONG)(pConfigInfo->ulSRatePosition + ulHwSampleCount*pConfigInfo->ulSRateIncrement);
+
+        lSRatePosition = (LONG)(pConfigInfo->ulSRatePosition + ulHwSampleCount * pConfigInfo->ulSRateIncrement);
         lSRatePosition = lSRatePosition - (LONG)ulSampleCount*(LONG)SRATE_SHIFT_VALUE;
 
@@ -439 +463 @@
     }
     else 
-    if(OSS16_WaveAddBuffer(StreamId, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) != OSSERR_SUCCESS) 
-    {
+    {
+       if( (rc=OSS16_WaveAddBuffer(StreamId, pUserBuffer, ulBytesToTransfer, pulBytesTransferred)) != OSSERR_SUCCESS) 
+       {
         *pulBytesTransferred = 0;
+        dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer failed due to an error rc=%x",(USHORT)rc));
         return FALSE;
+        }
     }
     return TRUE;
@@ -473 +500 @@
 BOOL WAVEPLAY::GetSpace(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, ULONG FAR *pulStreamSpace)
 {
-    ULONG space;
+    ULONG space,cvt;
 
 //    if (!waveOpened) return TRUE;
@@ -484 +511 @@
         return FALSE;
     }
-
-    *pulStreamSpace  = ConvertLengthInvert(space, pConfigInfo);
+    LastSpace = space;
+    cvt  = ConvertLengthInvert(space, pConfigInfo);
     //round to sample boundary
-    *pulStreamSpace &= ~(pConfigInfo->ulSampleSize - 1);
+    *pulStreamSpace =cvt & ( ~(pConfigInfo->ulSampleSize - 1));
     return TRUE;
 }