Changeset 61352 in vbox for trunk/include

Timestamp:

Jun 1, 2016 12:58:14 AM (9 years ago)

Author:

vboxsync

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

107648

Message:

AudioMixBuffer,tstAudioMixBuffer,pdmaudioifs.h: Fixed buffer overflow in AudioMixBufWriteAtEx during testcase run due to incomplete checking. Fixed some coding convesion issues. Made the debug build of the testcsae always use the electric fence heap.

File:

• trunk/include/VBox/vmm/pdmaudioifs.h (modified) (5 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -92 +92 @@
     int64_t i64LSample;
     int64_t i64RSample;
-} PDMAUDIOSAMPLE, *PPDMAUDIOSAMPLE;
+} PDMAUDIOSAMPLE;
+/** Pointer to a single (stereo) audio sample.   */
+typedef PDMAUDIOSAMPLE *PPDMAUDIOSAMPLE;
+/** Pointer to a const single (stereo) audio sample.   */
+typedef PDMAUDIOSAMPLE const *PCPDMAUDIOSAMPLE;
 
 typedef enum PDMAUDIOENDIANNESS
@@ -344 +348 @@
  * the audioMixBufConvFromXXX / audioMixBufConvToXXX macros.
  */
-typedef struct PDMAUDMIXBUF_CONVOPTS
+typedef struct PDMAUDMIXBUFCONVOPTS
 {
     /** Number of audio samples to convert. */
@@ -352 +356 @@
      *  all conversion functions. */
     PDMAUDIOVOLUME Volume;
-} PDMAUDMIXBUF_CONVOPTS, *PPDMAUDMIXBUF_CONVOPTS;
+} PDMAUDMIXBUFCONVOPTS;
+/** Pointer to conversion parameters for the audio mixer.   */
+typedef PDMAUDMIXBUFCONVOPTS *PPDMAUDMIXBUFCONVOPTS;
+/** Pointer to const conversion parameters for the audio mixer.   */
+typedef PDMAUDMIXBUFCONVOPTS const *PCPDMAUDMIXBUFCONVOPTS;
 
 /**
@@ -361 +369 @@
 typedef PDMAUDIOMIXBUFFMT *PPDMAUDIOMIXBUFFMT;
 
-/** Function pointer definition for a conversion-from routine
- *  used by the PDM audio mixing buffer. */
-typedef uint32_t (PDMAUDMIXBUF_FN_CONVFROM) (PPDMAUDIOSAMPLE paDst, const void *pvSrc, uint32_t cbSrc, const PPDMAUDMIXBUF_CONVOPTS pOpts);
-typedef PDMAUDMIXBUF_FN_CONVFROM *PPDMAUDMIXBUF_FN_CONVFROM;
-
-/** Function definition for a conversion-to routine
- *  used by the PDM audio mixing buffer. */
-typedef void (PDMAUDMIXBUF_FN_CONVTO) (void *pvDst, const PPDMAUDIOSAMPLE paSrc, const PPDMAUDMIXBUF_CONVOPTS pOpts);
-typedef PDMAUDMIXBUF_FN_CONVTO *PPDMAUDMIXBUF_FN_CONVTO;
+/**
+ * Convertion-from function used by the PDM audio buffer mixer.
+ *
+ * @returns Number of samples returned.
+ * @param   paDst           Where to return the converted samples.
+ * @param   pvSrc           The source samples bytes.
+ * @param   cbSrc           Number of bytes to convert.
+ * @param   pOpts           Conversion options.
+ */
+typedef DECLCALLBACK(uint32_t) FNPDMAUDIOMIXBUFCONVFROM(PPDMAUDIOSAMPLE paDst, const void *pvSrc, uint32_t cbSrc,
+                                                        PCPDMAUDMIXBUFCONVOPTS pOpts);
+/** Pointer to a convertion-from function used by the PDM audio buffer mixer. */
+typedef FNPDMAUDIOMIXBUFCONVFROM *PFNPDMAUDIOMIXBUFCONVFROM;
+
+/**
+ * Convertion-to function used by the PDM audio buffer mixer.
+ *
+ * @param   pvDst           Output buffer.
+ * @param   paSrc           The input samples.
+ * @param   pOpts           Conversion options.
+ */
+typedef DECLCALLBACK(void) FNPDMAUDIOMIXBUFCONVTO(void *pvDst, PCPDMAUDIOSAMPLE paSrc, PCPDMAUDMIXBUFCONVOPTS pOpts);
+/** Pointer to a convertion-to function used by the PDM audio buffer mixer. */
+typedef FNPDMAUDIOMIXBUFCONVTO *PFNPDMAUDIOMIXBUFCONVTO;
 
 typedef struct PDMAUDIOMIXBUF *PPDMAUDIOMIXBUF;
@@ -408 +431 @@
     PDMAUDIOMIXBUFFMT         AudioFmt;
     /** Standard conversion-to function for set AudioFmt. */
-    PPDMAUDMIXBUF_FN_CONVTO   pConvTo;
+    PFNPDMAUDIOMIXBUFCONVTO   pfnConvTo;
     /** Standard conversion-from function for set AudioFmt. */
-    PPDMAUDMIXBUF_FN_CONVFROM pConvFrom;
+    PFNPDMAUDIOMIXBUFCONVFROM pfnConvFrom;
     /**
      * Ratio of the associated parent stream's frequency by this stream's