VirtualBox

Changeset 89458 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Jun 2, 2021 9:04:06 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
144812
Message:

Audio/ValKit: Simplified code a bit by removing unnecessary parameters. bugref:10008

Location:
trunk/src/VBox
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/AudioTestService.cpp

    r89456 r89458  
    609609
    610610    PATSPKTREQTONEPLAY pReq = (PATSPKTREQTONEPLAY)pPktHdr;
    611     rc = pThis->Callbacks.pfnTonePlay(pThis->Callbacks.pvUser, &pReq->StreamCfg, &pReq->ToneParms);
     611    rc = pThis->Callbacks.pfnTonePlay(pThis->Callbacks.pvUser, &pReq->ToneParms);
    612612
    613613    int rc2 = atsReplyAck(pThis, pClient, pPktHdr);
    … …  
    640640
    641641    PATSPKTREQTONEREC pReq = (PATSPKTREQTONEREC)pPktHdr;
    642     rc = pThis->Callbacks.pfnToneRecord(pThis->Callbacks.pvUser, &pReq->StreamCfg, &pReq->ToneParms);
     642    rc = pThis->Callbacks.pfnToneRecord(pThis->Callbacks.pvUser, &pReq->ToneParms);
    643643
    644644    int rc2 = atsReplyAck(pThis, pClient, pPktHdr);

  • trunk/src/VBox/Devices/Audio/AudioTestService.h

    r89456 r89458  
    5656     * @returns VBox status code.
    5757     * @param   pvUser          User-supplied pointer to context data. Optional.
    58      * @param   pStreamCfg      Audio stream configuration to use for stream to play tone on.
    5958     * @param   pToneParms      Tone parameters to use for playback.
    6059     */
    61     DECLR3CALLBACKMEMBER(int, pfnTonePlay, (void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms));
     60    DECLR3CALLBACKMEMBER(int, pfnTonePlay, (void const *pvUser, PAUDIOTESTTONEPARMS pToneParms));
    6261
    6362    /**
    … …  
    6665     * @returns VBox status code.
    6766     * @param   pvUser          User-supplied pointer to context data. Optional.
    68      * @param   pStreamCfg      Audio stream configuration to use for stream to play tone on.
    69      * @param   cMsDelay        Delay (in ms) before start recording.
    70      * @param   cMsDuration     Duration (in ms) to record.
     67     * @param   pToneParms      Tone parameters to use for recording.
    7168     */
    72     DECLR3CALLBACKMEMBER(int, pfnToneRecord, (void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms));
     69    DECLR3CALLBACKMEMBER(int, pfnToneRecord, (void const *pvUser, PAUDIOTESTTONEPARMS pToneParms));
    7370
    7471    /** Pointer to opaque user-provided context data. */

  • trunk/src/VBox/Devices/Audio/AudioTestServiceClient.cpp

    r89456 r89458  
    355355 * @returns VBox status code.
    356356 * @param   pClient             Client to issue command for.
    357  * @param   pStreamCfg          Audio stream configuration to use.
    358357 * @param   pToneParms          Tone parameters to use.
    359358 * @note    How (and if) the server plays a tone depends on the actual implementation side.
    360359 */
    361 int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
     360int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PAUDIOTESTTONEPARMS pToneParms)
    362361{
    363362    ATSPKTREQTONEPLAY Req;
    364363
    365     memcpy(&Req.StreamCfg, pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
    366364    memcpy(&Req.ToneParms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
    367365
    … …  
    380378 * @returns VBox status code.
    381379 * @param   pClient             Client to issue command for.
    382  * @param   pStreamCfg          Audio stream configuration to use.
    383380 * @param   pToneParms          Tone parameters to use.
    384381 * @note    How (and if) the server plays a tone depends on the actual implementation side.
    385382 */
    386 int AudioTestSvcClientToneRecord(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
     383int AudioTestSvcClientToneRecord(PATSCLIENT pClient, PAUDIOTESTTONEPARMS pToneParms)
    387384{
    388385    ATSPKTREQTONEREC Req;
    389386
    390     memcpy(&Req.StreamCfg, pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
    391387    memcpy(&Req.ToneParms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
    392388

  • trunk/src/VBox/Devices/Audio/AudioTestServiceClient.h

    r89456 r89458  
    3333int AudioTestSvcClientTestSetBegin(PATSCLIENT pClient, const char *pszTag);
    3434int AudioTestSvcClientTestSetEnd(PATSCLIENT pClient, const char *pszTag);
    35 int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms);
    36 int AudioTestSvcClientToneRecord(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms);
     35int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PAUDIOTESTTONEPARMS pToneParms);
     36int AudioTestSvcClientToneRecord(PATSCLIENT pClient, PAUDIOTESTTONEPARMS pToneParms);
    3737int AudioTestSvcClientClose(PATSCLIENT pClient);
    3838

  • trunk/src/VBox/Devices/Audio/AudioTestServiceProtocol.h

    r89456 r89458  
    162162    /** Embedded packet header. */
    163163    ATSPKTHDR          Hdr;
    164     /** Stream configuration to use for playing the tone.
    165      *  Note: Depending on the actual implementation this configuration might or might not be available / supported. */
    166     PDMAUDIOSTREAMCFG  StreamCfg;
    167164    /** Test tone parameters for playback. */
    168165    AUDIOTESTTONEPARMS ToneParms;
    169 #if HC_ARCH_BITS == 64
    170     uint8_t            aPadding[4+8];
    171 #else
    172     uint8_t            aPadding[6+8];
    173 #endif
     166    uint8_t            aPadding[8];
    174167} ATSPKTREQTONEPLAY;
    175168AssertCompileSizeAlignment(ATSPKTREQTONEPLAY, ATSPKT_ALIGNMENT);
    … …  
    186179    /** Embedded packet header. */
    187180    ATSPKTHDR          Hdr;
    188     /** Stream configuration to use for recording the tone.
    189      *  Note: Depending on the actual implementation this configuration might or might not be available / supported. */
    190     PDMAUDIOSTREAMCFG  StreamCfg;
    191181    /** Test tone parameters for playback. */
    192182    AUDIOTESTTONEPARMS ToneParms;
    193 #if HC_ARCH_BITS == 64
    194     uint8_t            aPadding[4+8];
    195 #else
    196     uint8_t            aPadding[6+8];
    197 #endif
     183    uint8_t            aPadding[8];
    198184} ATSPKTREQTONEREC;
    199185AssertCompileSizeAlignment(ATSPKTREQTONEREC, ATSPKT_ALIGNMENT);

  • trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp

    r89383 r89458  
    116116 * Note: Called within server (client serving) thread.
    117117 */
    118 static DECLCALLBACK(int) drvHostValKitAudioSvcTonePlayCallback(void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
     118static DECLCALLBACK(int) drvHostValKitAudioSvcTonePlayCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
    119119{
    120120    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
    … …  
    123123    AssertPtrReturn(pTestData, VERR_NO_MEMORY);
    124124
    125     memcpy(&pTestData->StreamCfg,        pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
    126125    memcpy(&pTestData->t.TestTone.Parms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
    127126
    128     AudioTestToneInit(&pTestData->t.TestTone.Tone, &pStreamCfg->Props, pTestData->t.TestTone.Parms.dbFreqHz);
    129 
    130     pTestData->t.TestTone.cbToWrite = PDMAudioPropsMilliToBytes(&pStreamCfg->Props,
     127    AudioTestToneInit(&pTestData->t.TestTone.Tone, &pToneParms->Props, pTestData->t.TestTone.Parms.dbFreqHz);
     128
     129    pTestData->t.TestTone.cbToWrite = PDMAudioPropsMilliToBytes(&pToneParms->Props,
    131130                                                                pTestData->t.TestTone.Parms.msDuration);
    132131    int rc = RTCritSectEnter(&pThis->CritSect);

  • trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

    r89457 r89458  
    593593
    594594/** @copydoc ATSCALLBACKS::pfnTonePlay */
    595 static DECLCALLBACK(int) audioTestSvcTonePlayCallback(void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
     595static DECLCALLBACK(int) audioTestSvcTonePlayCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
    596596{
    597597    PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
    … …  
    599599
    600600    AUDIOTESTTONE TstTone;
    601     AudioTestToneInitRandom(&TstTone, &pStreamCfg->Props);
     601    AudioTestToneInitRandom(&TstTone, &pToneParms->Props);
    602602
    603603    const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
    604604
    605     int rc = audioTestCreateStreamDefaultOut(pTstEnv, pTstStream, &pStreamCfg->Props);
     605    int rc = audioTestCreateStreamDefaultOut(pTstEnv, pTstStream, &pToneParms->Props);
    606606    if (RT_SUCCESS(rc))
    607607    {
    … …  
    636636
    637637/** @copydoc ATSCALLBACKS::pfnToneRecord */
    638 static DECLCALLBACK(int) audioTestSvcToneRecordCallback(void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
     638static DECLCALLBACK(int) audioTestSvcToneRecordCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
    639639{
    640640    PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
    … …  
    643643    const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
    644644
    645     int rc = audioTestCreateStreamDefaultIn(pTstEnv, pTstStream, &pStreamCfg->Props);
     645    int rc = audioTestCreateStreamDefaultIn(pTstEnv, pTstStream, &pToneParms->Props);
    646646    if (RT_SUCCESS(rc))
    647647    {
    … …  
    650650        TstParms.enmType  = AUDIOTESTTYPE_TESTTONE_RECORD;
    651651        TstParms.enmDir   = PDMAUDIODIR_IN;
    652         TstParms.Props    = pStreamCfg->Props;
    653         pToneParms->Props = pStreamCfg->Props;
     652        TstParms.Props    = pToneParms->Props;
    654653        TstParms.TestTone = *pToneParms;
    655654
    … …  
    10871086            Cfg.Props = pTstParms->Props;
    10881087
    1089             rc = AudioTestSvcClientTonePlay(&pTstEnv->u.Host.Client, &Cfg, &pTstParms->TestTone);
     1088            rc = AudioTestSvcClientTonePlay(&pTstEnv->u.Host.Client, &pTstParms->TestTone);
    10901089            if (RT_SUCCESS(rc))
    10911090            {
    … …  
    11461145    for (uint32_t i = 0; i < pTstParms->cIterations; i++)
    11471146    {
     1147        pTstParms->TestTone.Props      = pTstParms->Props;
    11481148        pTstParms->TestTone.msDuration = RTRandU32Ex(50 /* ms */, RT_MS_10SEC); /** @todo Record even longer? */
    11491149
    … …  
    11521152        if (RT_SUCCESS(rc))
    11531153        {
    1154             PDMAUDIOSTREAMCFG Cfg;
    1155             RT_ZERO(Cfg);
    1156             /** @todo Add more parameters here? */
    1157             Cfg.Props = pTstParms->Props;
    1158 
    1159             rc = AudioTestSvcClientToneRecord(&pTstEnv->u.Host.Client, &Cfg, &pTstParms->TestTone);
     1154            rc = AudioTestSvcClientToneRecord(&pTstEnv->u.Host.Client, &pTstParms->TestTone);
    11601155            if (RT_SUCCESS(rc))
    11611156            {
    … …  
    20952090                        memcpy(&ToneParms.Props, &CfgAcq.Props, sizeof(PDMAUDIOPCMPROPS));
    20962091
    2097                         rc = AudioTestSvcClientTonePlay(&Conn, &CfgAcq, &ToneParms);
     2092                        rc = AudioTestSvcClientTonePlay(&Conn, &ToneParms);
    20982093
    20992094                        int rc2 = AudioTestSvcClientClose(&Conn);
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