VirtualBox

Ignore:
Timestamp:
Apr 4, 2021 10:45:13 PM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
143603
Message:

Audio: Trimmed down PDMAUDIOSTREAM a lot by moving non-essential stuff into an wrapper structure in DrvAudio. This allows for the mixing buffers and other stuff to move (back?) into AudioMixBuffer.h. Also started specifying away to skip the mixing in DrvAudio as only DevSB16 really needs this (goal is to reduce number of copies and bufferings). bugref:9890

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp

    r88314 r88356  
    206206     * General stuff.
    207207     */
    208     PDMAUDIOMIXBUF mb;
     208    AUDIOMIXBUF mb;
    209209    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&mb, "Single", &config, cBufSize));
    210210    RTTESTI_CHECK(AudioMixBufSize(&mb) == cBufSize);
     
    323323    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&cfg_p));
    324324
    325     PDMAUDIOMIXBUF parent;
     325    AUDIOMIXBUF parent;
    326326    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg_p, cParentBufSize));
    327327
     
    340340    uint32_t cChildBufSize = RTRandU32Ex(cFrames /* Min */, 64 /* Max */);
    341341
    342     PDMAUDIOMIXBUF child1;
     342    AUDIOMIXBUF child1;
    343343    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child1, "Child1", &cfg_c1, cChildBufSize));
    344344    RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child1, &parent));
     
    355355    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&cfg_c2));
    356356
    357     PDMAUDIOMIXBUF child2;
     357    AUDIOMIXBUF child2;
    358358    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child2, "Child2", &cfg_c2, cChildBufSize));
    359359    RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child2, &parent));
     
    460460    PDMAUDIOPCMPROPS const CfgDst = PDMAUDIOPCMPROPS_INITIALIZER(2 /*cbSample*/, true /*fSigned*/, 2 /*ch*/, uToHz, false /*fSwap*/);
    461461    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&CfgDst));
    462     PDMAUDIOMIXBUF Parent;
     462    AUDIOMIXBUF Parent;
    463463    RTTESTI_CHECK_RC_OK_RETV(AudioMixBufInit(&Parent, "ParentDownsampling", &CfgDst, cFramesParent));
    464464
     
    467467    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&CfgSrc));
    468468    uint32_t const cFramesChild = RTRandU32Ex(32, RT_ELEMENTS(aSrcFrames));
    469     PDMAUDIOMIXBUF Child;
     469    AUDIOMIXBUF Child;
    470470    RTTESTI_CHECK_RC_OK_RETV(AudioMixBufInit(&Child, "ChildDownsampling", &CfgSrc, cFramesChild));
    471471    RTTESTI_CHECK_RC_OK_RETV(AudioMixBufLinkTo(&Child, &Parent));
     
    567567    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&cfg_p));
    568568
    569     PDMAUDIOMIXBUF parent;
     569    AUDIOMIXBUF parent;
    570570    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg_p, cBufSize));
    571571
     
    589589    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&cfg_c));
    590590
    591     PDMAUDIOMIXBUF child;
     591    AUDIOMIXBUF child;
    592592    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &cfg_c, cBufSize));
    593593    RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child, &parent));
     
    669669    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&cfg_p));
    670670
    671     PDMAUDIOMIXBUF parent;
     671    AUDIOMIXBUF parent;
    672672    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg_p, cBufSize));
    673673
     
    683683    RTTESTI_CHECK(AudioHlpPcmPropsAreValid(&cfg_c));
    684684
    685     PDMAUDIOMIXBUF child;
     685    AUDIOMIXBUF child;
    686686    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &cfg_c, cBufSize));
    687687    RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child, &parent));
     
    763763
    764764    PDMAUDIOVOLUME vol = { false, 0, 0 };   /* Not muted. */
    765     PDMAUDIOMIXBUF parent;
     765    AUDIOMIXBUF parent;
    766766    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg, cBufSize));
    767767
    768     PDMAUDIOMIXBUF child;
     768    AUDIOMIXBUF child;
    769769    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &cfg, cBufSize));
    770770    RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child, &parent));
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette