Changeset 391 for OCO/trunk/drv16/waverec.cpp

Timestamp:

Oct 8, 2008, 11:28:16 PM (17 years ago)

Author:

rjerant

Message:

Add GetHwPtr() to code base

File:

• OCO/trunk/drv16/waverec.cpp (modified) (14 diffs)

OCO/trunk/drv16/waverec.cpp

@@ -41 +41 @@
 BOOL WAVEREC::Open(ULONG ulDevice, ULONG ulStreamType, ULONG ulSysFileNum, OSSSTREAMID FAR *pStreamId)
 {
-    if(StreamId == 0) 
-    {
-        if(OSS16_WaveOpen(ulDevice, ulStreamType, ulSysFileNum, pStreamId) != OSSERR_SUCCESS) 
+    if(StreamId == 0)
+    {
+        if(OSS16_WaveOpen(ulDevice, ulStreamType, ulSysFileNum, pStreamId) != OSSERR_SUCCESS)
         {
             dprintf(("OSS16_WaveOpen failed!!"));
@@ -67 +67 @@
 BOOL WAVEREC::Close(OSSSTREAMID StreamId)
 {
-    if(devCaps[ulDeviceNr].waveInCaps.nrStreams > 1) 
+    if(devCaps[ulDeviceNr].waveInCaps.nrStreams > 1)
     {
         return OSS16_WaveClose(StreamId) == OSSERR_SUCCESS;
@@ -115 +115 @@
     //while the stream is playing.
     ULONG minimumsize = (ulFirstBufSize/2);
-    if(minimumsize && minimumsize < fragsize) 
+    if(minimumsize && minimumsize < fragsize)
     {
         while(minimumsize < fragsize) fragsize = fragsize / 2;
-            
-        if(fragsize < ulPCMConsumeRate/256) 
+
+        if(fragsize < ulPCMConsumeRate/256)
             {//lower limit; don't accept extremely small buffers
                 fragsize = ulPCMConsumeRate/256;
             }
-    }   
+    }
     samplesize = (int)pConfigInfo->ulHwSampleSize;
 
@@ -133 +133 @@
 
     dprintf(("WAVEREC::ConfigDev: Fragment size %d", (USHORT)fragsize));
-  
+
     hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
     hwparam.ulBitsPerSample = pConfigInfo->ulHwBitsPerSample;
@@ -147 +147 @@
 //Read and convert (if required) wave data from audio device
 //******************************************************************************
-BOOL WAVEREC::Transfer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, 
-                       LINEAR pUserBuffer, ULONG ulBytesToTransfer, 
+BOOL WAVEREC::Transfer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo,
+                       LINEAR pUserBuffer, ULONG ulBytesToTransfer,
                        ULONG FAR *pulBytesTransferred)
 {
-    if(pConfigInfo->usConversion == CONVERT_NONE) 
-    {
-        if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE) 
+    if(pConfigInfo->usConversion == CONVERT_NONE)
+    {
+        if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE)
         {
             *pulBytesTransferred = 0;
@@ -159 +159 @@
         }
     }
-    else 
-    {
-        if(pConfigInfo->pfnConvert) 
+    else
+    {
+        if(pConfigInfo->pfnConvert)
         {
             ULONG ulCvtBufferSize;
@@ -169 +169 @@
             ulCvtBufferSize = min(CONVERSION_BUFFER_SIZE, ulCvtBufferSize);
 
-            if(AddBuffer(StreamId, pConfigInfo, pConfigInfo->pConversionBuffer, ulCvtBufferSize, pulBytesTransferred) == FALSE) 
+            if(AddBuffer(StreamId, pConfigInfo, pConfigInfo->pConversionBuffer, ulCvtBufferSize, pulBytesTransferred) == FALSE)
             {
                 *pulBytesTransferred = 0;
@@ -198 +198 @@
 // Perform sample rate conversion if required, else send buffer directly to ALSA
 //******************************************************************************
-BOOL WAVEREC::AddBuffer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, LINEAR pUserBuffer, 
+BOOL WAVEREC::AddBuffer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, LINEAR pUserBuffer,
                         ULONG ulBytesToTransfer, ULONG FAR *pulBytesTransferred)
 {
-    if(pConfigInfo->fSampleRateConversion) 
+    if(pConfigInfo->fSampleRateConversion)
     {
         ULONG ulCvtBufferSize, ulHwSampleCount, ulSampleCount;
@@ -207 +207 @@
 
         //bytes to convert is bounded by bytes to transfer & max conversion buffer size
-        ulCvtBufferSize = SRATE_CONVERT_LENGTH_INVERT(ulBytesToTransfer, pConfigInfo->ulSRatePosition, 
+        ulCvtBufferSize = SRATE_CONVERT_LENGTH_INVERT(ulBytesToTransfer, pConfigInfo->ulSRatePosition,
                                                       pConfigInfo->ulSRateIncrement);
         ulCvtBufferSize = min(CONVERSION_BUFFER_SIZE, ulCvtBufferSize);
-        
+
         //round to sample boundary
         ulCvtBufferSize &= ~(pConfigInfo->ulHwSampleSize - 1);
         if(ulCvtBufferSize == 0) {
             *pulBytesTransferred = ulBytesToTransfer;
-            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) { 
+            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) {
                 pConfigInfo->ulSRatePosition -= pConfigInfo->ulSRateIncrement;
             }
@@ -223 +223 @@
 
         if(OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred) != OSSERR_SUCCESS ||
-           *pulBytesTransferred == 0) 
+           *pulBytesTransferred == 0)
         {
             *pulBytesTransferred = 0;
@@ -229 +229 @@
         }
         ulHwSampleCount      = *pulBytesTransferred/pConfigInfo->ulHwSampleSize;
-        
-        //convert back from conversion to 'real' 
-        ulSampleCount        = SRATE_CONVERT_LENGTH(ulHwSampleCount, pConfigInfo->ulSRatePosition, 
+
+        //convert back from conversion to 'real'
+        ulSampleCount        = SRATE_CONVERT_LENGTH(ulHwSampleCount, pConfigInfo->ulSRatePosition,
                                                     pConfigInfo->ulSRateIncrement);
         *pulBytesTransferred = ulSampleCount*pConfigInfo->ulHwSampleSize;
-        
+
         if(ulSampleCount == 0) {
             return FALSE;
@@ -245 +245 @@
 
         //convert recorded audio data
-        pConfigInfo->pfnSRateConv(pConfigInfo->pSRateConvBuffer, *pulBytesTransferred, pUserBuffer, 
+        pConfigInfo->pfnSRateConv(pConfigInfo->pSRateConvBuffer, *pulBytesTransferred, pUserBuffer,
                                   pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement);
 
@@ -253 +253 @@
         pConfigInfo->ulSRatePosition  = (ULONG)lSRatePosition;
     }
-    else 
-    if(OSS16_WaveAddBuffer(StreamId, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) != OSSERR_SUCCESS) 
+    else
+    if(OSS16_WaveAddBuffer(StreamId, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) != OSSERR_SUCCESS)
     {
         *pulBytesTransferred = 0;
@@ -293 +293 @@
     //round to sample boundary
     *pulStreamSpace &= ~(pConfigInfo->ulSampleSize - 1);
+    return TRUE;
+}
+//******************************************************************************
+//Get Bytes written to cyclic buffer (+ take conversion factor into account)
+//******************************************************************************
+BOOL WAVEREC::GetHwPtr(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, ULONG FAR *pulHwPtr)
+{
+    ULONG space,cvt;
+
+    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS) {
+        *pulHwPtr = 0;
+        #ifdef DEBUG
+        dprintf(("OSS16_WAVEREC::WaveGetHwPtr: Failed"));
+        #endif /* DEBUG */
+        return FALSE;
+    }
+    cvt  = ConvertLengthInvert(space, pConfigInfo);
+    //round to sample boundary
+    *pulHwPtr = cvt & ( ~(pConfigInfo->ulSampleSize - 1));
     return TRUE;
 }