Changeset 35116 in vbox for trunk/src

Timestamp:

Dec 15, 2010 9:54:48 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68950

Message:

Audio: some santiy checks (debug only)

Location:

trunk/src/VBox/Devices/Audio

Files:

• audio.c (modified) (4 diffs)
• audio_int.h (modified) (2 diffs)
• audio_template.h (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/audio.c

@@ -937 +937 @@
         }
 
+        if (ret + osamp > sw->buf_samples)
+            Log(("audio_pcm_sw_read: buffer overflow!! ret = %d, osamp = %d, buf_samples = %d\n",
+                  ret, osamp, sw->buf_samples));
         st_rate_flow (sw->rate, src, dst, &isamp, &osamp);
         swlim -= osamp;
@@ -945 +948 @@
     }
 
+    if (ret > sw->buf_samples)
+        Log(("audio_pcm_sw_read: buffer overflow!! ret = %d, buf_samples = %d\n", ret, sw->buf_samples));
     sw->clip (buf, sw->buf, ret);
     sw->total_hw_samples_acquired += total;
@@ -1036 +1041 @@
     swlim = ((int64_t) dead << 32) / sw->ratio;
     swlim = audio_MIN (swlim, samples);
+    if (swlim > sw->buf_samples)
+        Log(("audio_pcm_sw_write: buffer overflow!! swlim = %d, buf_samples = %d\n",
+             swlim, pos, sw->buf_samples));
     if (swlim) {
 #ifndef VBOX
@@ -1053 +1061 @@
         isamp = swlim;
         osamp = blck;
+        if (pos + isamp > sw->buf_samples)
+            Log(("audio_pcm_sw_write: buffer overflow!! isamp = %d, pos = %d, buf_samples = %d\n",
+                 isamp, pos, sw->buf_samples));
         st_rate_flow_mix (
             sw->rate,

trunk/src/VBox/Devices/Audio/audio_int.h

@@ -122 +122 @@
     int64_t ratio;
     st_sample_t *buf;
+    int buf_samples;
     void *rate;
     int total_hw_samples_mixed;
@@ -140 +141 @@
     int total_hw_samples_acquired;
     st_sample_t *buf;
+    int buf_samples; /* for debugging only */
     f_sample *clip;
     HWVoiceIn *hw;

trunk/src/VBox/Devices/Audio/audio_template.h

@@ -105 +105 @@
     sw->buf = NULL;
     sw->rate = NULL;
+    sw->buf_samples = 0;
 }
 
@@ -112 +113 @@
 
     samples = ((int64_t) sw->hw->samples << 32) / sw->ratio;
+    sw->buf_samples = 0;
 
     sw->buf = audio_calloc (AUDIO_FUNC, samples, sizeof (st_sample_t));
@@ -130 +132 @@
         return -1;
     }
+
+    sw->buf_samples = samples;
     return 0;
 }