Changeset 3073 for trunk/src

Timestamp:

Mar 10, 2000, 4:19:48 PM (25 years ago)

Author:

mike

Message:

Changed buffer size calculation

Location:

trunk/src/dsound/new

Files:

• Dart.h (modified) (2 diffs)
• OS2PrimBuff.cpp (modified) (1 diff)
• dart.cpp (modified) (15 diffs)

trunk/src/dsound/new/Dart.h

@@ -30 +30 @@
 #endif
 
-#define BUFFER_SIZE 16384
-#define NUM_DART_BUFFS 16
+#define BUFFER_SIZE 32768
+
+extern  ULONG ulNumDartBuffs;
 
 long Dart_Open_Device(USHORT *pusDeviceID, void **vpMixBuffer, void **vpMixSetup,
@@ -44 +45 @@
 long Dart_Play(USHORT usDeviceID, void *vpMixSetup, void *vpMixBuffer, long playing);
 long Dart_SetFormat(USHORT *pusDeviceID, void *vpMixSetup, void *vpBufferParms,
-                    void *vpMixBuffer, LONG lBPS, LONG lSPS, LONG lChannels );
+                    void **vpMixBuffer, LONG lBPS, LONG lSPS, LONG lChannels );
 

trunk/src/dsound/new/OS2PrimBuff.cpp

@@ -466 +466 @@
    dprintf(("DSOUND-PrimBuff: BPS = %d, Rate = %d, Ch = %d", me->bps, me->rate, me->channels));
 
-   Dart_SetFormat(&me->usDeviceID, me->vpMixSetup, me->vpBuffParms, me->vpMixBuffer, me->bps, me->rate, me->channels);
+   Dart_SetFormat(&me->usDeviceID, me->vpMixSetup, me->vpBuffParms, &me->vpMixBuffer, me->bps, me->rate, me->channels);
 
    return DS_OK;

trunk/src/dsound/new/dart.cpp

@@ -22 +22 @@
 
 static MCI_MIXSETUP_PARMS *MixSetup_Global;
-static MCI_MIX_BUFFER     *pMixBuffs;
 static long               lLastBuff;
 static char               *pDSoundBuff;
@@ -28 +27 @@
 
 USHORT               usDeviceID;                 /* Amp Mixer device id          */
-MCI_MIX_BUFFER       MixBuffers[NUM_DART_BUFFS]; /* Device buffers               */
+
+/* TODO: scrap this variable! */
+MCI_MIX_BUFFER       *pMixBuffers;               /* Device buffers               */
+
 MCI_MIXSETUP_PARMS   MixSetupParms;              /* Mixer parameters             */
 MCI_BUFFER_PARMS     BufferParms;                /* Device buffer parms          */
-
+ULONG                ulNumDartBuffs;             /* # of DART buffers            */
 
 #define ULONG_LOWD(ul)  (*(USHORT *)((ULONG *)(&ul)))     /* Low  Word */
@@ -37 +39 @@
 //******************************************************************************
 //******************************************************************************
-LONG APIENTRY OS2_Dart_Update(ULONG ulStatus,PMCI_MIX_BUFFER pBuffer,ULONG ulFlags)
-{
-   //MCI_STATUS_PARMS Status;
+LONG APIENTRY OS2_Dart_Update(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer, ULONG ulFlags)
+{
    ULONG           rc;
 
@@ -47 +48 @@
    {
       lLastBuff++;
-      if (lLastBuff == NUM_DART_BUFFS)
+      if (lLastBuff == ulNumDartBuffs)
          lLastBuff = 0;
 
       /* Now mix sound from all playing secondary SoundBuffers into the primary buffer */
-      MixCallback(BUFFER_SIZE/NUM_DART_BUFFS);
+      MixCallback(BUFFER_SIZE/ulNumDartBuffs);
 
       /* Fill The next buff from the DSound Buffer */
-      memcpy( pMixBuffs[lLastBuff].pBuffer, &pDSoundBuff[lLastBuff*(BUFFER_SIZE/NUM_DART_BUFFS)], BUFFER_SIZE/NUM_DART_BUFFS );
+      memcpy( pMixBuffers[lLastBuff].pBuffer, &pDSoundBuff[lLastBuff*(BUFFER_SIZE/ulNumDartBuffs)], BUFFER_SIZE/ulNumDartBuffs );
 
       /* Send the NEXT Buffer to Dart for playing! */
-      rc = MixSetup_Global->pmixWrite(MixSetup_Global->ulMixHandle, &pMixBuffs[lLastBuff], 1 );
+      rc = MixSetup_Global->pmixWrite(MixSetup_Global->ulMixHandle, &pMixBuffers[lLastBuff], 1 );
       //dprintf(("DSOUND-DART: Playing Next Buffer %d", rc));
    }
@@ -70 +71 @@
 
    MCI_AMP_OPEN_PARMS  AmpOpenParms;
-   //MCI_WAVE_SET_PARMS WaveSetParms;
    ULONG   rc, ulNew;
    LONG    lAdd = 5;
@@ -77 +77 @@
    dprintf(("DSOUND-DART: Dart_Open_Device"));
 
+   /* TODO: remove eventually... */
    DosSetRelMaxFH(&lAdd, &ulNew);
 
-   *vpMixBuffer    = &MixBuffers;
+   ulNumDartBuffs = BUFFER_SIZE * 44100 / (2 * 2 * 2048 * 22050);
+
+   pMixBuffers = (MCI_MIX_BUFFER*)malloc(sizeof(MCI_MIX_BUFFER) * ulNumDartBuffs);
+
+   *vpMixBuffer    = pMixBuffers;
    *vpMixSetup     = &MixSetupParms;
    *vpBuffParms    = &BufferParms;
 
-   pMixBuffs = &MixBuffers[0];
    lLastBuff = 0;
 
@@ -134 +138 @@
    // my little brain could come up with!!
 
-   MixSetupParms.ulBufferSize = BUFFER_SIZE/NUM_DART_BUFFS;
-
-//   BufferParms->ulStructLength = sizeof(MCI_BUFFER_PARMS);
-   BufferParms.ulNumBuffers   = NUM_DART_BUFFS;
+   MixSetupParms.ulBufferSize = BUFFER_SIZE / ulNumDartBuffs;
+
+   BufferParms.ulNumBuffers   = ulNumDartBuffs;
    BufferParms.ulBufferSize   = MixSetupParms.ulBufferSize;
-   BufferParms.pBufList       = MixBuffers;
+   BufferParms.pBufList       = pMixBuffers;
 
    rc = mciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
@@ -155 +158 @@
    // the buffer to 0 is a click on Dart_Play and a Clink when real sound is written
    // to the buffer!
-   for (device = 0; device < NUM_DART_BUFFS; device++) {
-      memset(MixBuffers[device].pBuffer, 0, BUFFER_SIZE/NUM_DART_BUFFS);
+   for (device = 0; device < ulNumDartBuffs; device++) {
+      memset(pMixBuffers[device].pBuffer, 0, BUFFER_SIZE/ulNumDartBuffs);
    }
 
@@ -205 +208 @@
    dprintf(("DSOUND-DART: Dart_GetPosition"));
 
-   *pulPosition = (lLastBuff * (BUFFER_SIZE/NUM_DART_BUFFS)) + (BUFFER_SIZE/NUM_DART_BUFFS);
+   *pulPosition = (lLastBuff * (BUFFER_SIZE/ulNumDartBuffs)) + (BUFFER_SIZE/ulNumDartBuffs);
    if (*pulPosition > BUFFER_SIZE)
       *pulPosition = 0;
@@ -214 +217 @@
 }
 
-long Dart_SetFormat(USHORT *pusDeviceID, void *vpMixSetup, void *vpBufferParms, void *vpMixBuffer, LONG lBPS, LONG lSPS, LONG lChannels )
+long Dart_SetFormat(USHORT *pusDeviceID, void *vpMixSetup, void *vpBufferParms, void **vpMixBuffer, LONG lBPS, LONG lSPS, LONG lChannels )
 {
    ULONG   rc;
    MCI_MIXSETUP_PARMS  *MixSetup;
    MCI_BUFFER_PARMS    *BufferParms;
-   MCI_MIX_BUFFER      *MixBuffer;
    MCI_AMP_OPEN_PARMS  AmpOpenParms;
    short               device = 0;
 
-   MixSetup    = (MCI_MIXSETUP_PARMS*)vpMixSetup;
-   BufferParms = (MCI_BUFFER_PARMS*)vpBufferParms;
-   MixBuffer   = (MCI_MIX_BUFFER*)vpMixBuffer;
+   /* Recalculate the number of DART buffers based on the new data rate      */
+   /* Note: the factor 2048 means a 2K buffer, 1024 = 4K, 512 = 8K and so on */
+   ulNumDartBuffs = BUFFER_SIZE * 44100 / ((lBPS / 8) * lChannels * 2048 * lSPS);
+
+   /* Reallocate the MCI_MIX_BUFFER array */
+   free(pMixBuffers);
+   pMixBuffers = (MCI_MIX_BUFFER*)malloc(sizeof(MCI_MIX_BUFFER) * ulNumDartBuffs);
+
+   MixSetup     = (MCI_MIXSETUP_PARMS*)vpMixSetup;
+   BufferParms  = (MCI_BUFFER_PARMS*)vpBufferParms;
+   *vpMixBuffer = pMixBuffers;
+
 
    dprintf(("DSOUND-DART: Dart_SetFormat"));
@@ -280 +291 @@
 
    memset(BufferParms, 0, sizeof(MCI_BUFFER_PARMS));
-   memset(MixBuffer,   0, sizeof(MCI_MIX_BUFFER) * NUM_DART_BUFFS);
+   memset(pMixBuffers, 0, sizeof(MCI_MIX_BUFFER) * ulNumDartBuffs);
    BufferParms->ulStructLength = sizeof(MCI_BUFFER_PARMS);
-   BufferParms->ulNumBuffers   = NUM_DART_BUFFS;
-   BufferParms->ulBufferSize   = BUFFER_SIZE/NUM_DART_BUFFS;
-   BufferParms->pBufList       = MixBuffer;
-   MixBuffer->pBuffer          = NULL;
+   BufferParms->ulNumBuffers   = ulNumDartBuffs;
+   BufferParms->ulBufferSize   = BUFFER_SIZE/ulNumDartBuffs;
+   BufferParms->pBufList       = pMixBuffers;
+   pMixBuffers->pBuffer        = NULL;
 
    rc = mciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
@@ -292 +303 @@
       dprintf(("DSOUND-DART: MCI_BUFFER_ALLOCATE_MEMORY (SetFormat) %d", rc));
       mciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
-      memset(MixBuffer, 0, sizeof(MCI_MIX_BUFFER) * NUM_DART_BUFFS);
+      memset(pMixBuffers, 0, sizeof(MCI_MIX_BUFFER) * ulNumDartBuffs);
       return DSERR_OUTOFMEMORY;
    }
@@ -302 +313 @@
    // the buffer to 0 is a click on Dart_Play and a Clink when real sound is written
    // to the buffer!
-   for (int i=0; i<NUM_DART_BUFFS; i++) {
-      memset(MixBuffer[i].pBuffer, 0, BUFFER_SIZE/NUM_DART_BUFFS);
+   for (int i=0; i<ulNumDartBuffs; i++) {
+      memset(pMixBuffers[i].pBuffer, 0, BUFFER_SIZE/ulNumDartBuffs);
    }
 
@@ -311 +322 @@
 
       /* Mix the first buffer before playing */
-      MixCallback(BUFFER_SIZE/NUM_DART_BUFFS);
-      memcpy(pMixBuffs[lLastBuff].pBuffer, &pDSoundBuff[lLastBuff*(BUFFER_SIZE/NUM_DART_BUFFS)], BUFFER_SIZE/NUM_DART_BUFFS);
+      MixCallback(BUFFER_SIZE/ulNumDartBuffs);
+      memcpy(pMixBuffers[lLastBuff].pBuffer, &pDSoundBuff[lLastBuff*(BUFFER_SIZE/ulNumDartBuffs)], BUFFER_SIZE/ulNumDartBuffs);
 
       USHORT  sel = RestoreOS2FS();
       /* Note: the call to pmixWrite trashes the FS selector, we have to save */
       /* and then restore FS!!! Otherwise exception handling will be broken.  */
-      MixSetupParms.pmixWrite(MixSetupParms.ulMixHandle, MixBuffers, 2);
+      MixSetupParms.pmixWrite(MixSetupParms.ulMixHandle, pMixBuffers, 2);
       SetFS(sel);
       fIsPlaying = TRUE;
@@ -366 +377 @@
 
       /* Mix the first buffer before playing */
-      MixCallback(BUFFER_SIZE/NUM_DART_BUFFS);
-      memcpy(pMixBuffs[lLastBuff].pBuffer, &pDSoundBuff[lLastBuff*(BUFFER_SIZE/NUM_DART_BUFFS)], BUFFER_SIZE/NUM_DART_BUFFS);
+      MixCallback(BUFFER_SIZE/ulNumDartBuffs);
+      memcpy(MixBuffer[lLastBuff].pBuffer, &pDSoundBuff[lLastBuff*(BUFFER_SIZE/ulNumDartBuffs)], BUFFER_SIZE/ulNumDartBuffs);
 
       USHORT  sel = RestoreOS2FS();
       /* Note: the call to pmixWrite trashes the FS selector, we have to save */
       /* and then restore FS!!! Otherwise exception handling will be broken.  */
-      MixSetupParms.pmixWrite(MixSetupParms.ulMixHandle, MixBuffers, 2);
+      MixSetupParms.pmixWrite(MixSetupParms.ulMixHandle, MixBuffer, 2);
       SetFS(sel);
       fIsPlaying = TRUE;