VirtualBox

Changeset 67362 in vbox


Ignore:
Timestamp:
Jun 13, 2017 2:05:59 PM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
116082
Message:

Audio: Use VBOX_AUDIO_DEBUG_DUMP_PCM_DATA / VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH.

Location:
trunk/src/VBox/Devices/Audio
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r67333 r67362  
    5656//#define HDA_AS_PCI_EXPRESS
    5757#define VBOX_WITH_INTEL_HDA
    58 
    59 /*
    60  * HDA_DEBUG_DUMP_PCM_DATA enables dumping the raw PCM data
    61  * to a file on the host. Be sure to adjust HDA_DEBUG_DUMP_PCM_DATA_PATH
    62  * to your needs before using this!
    63  */
    64 //#define HDA_DEBUG_DUMP_PCM_DATA
    65 #ifdef HDA_DEBUG_DUMP_PCM_DATA
    66 # ifdef RT_OS_WINDOWS
    67 #  define HDA_DEBUG_DUMP_PCM_DATA_PATH "c:\\temp\\"
    68 # else
    69 #  define HDA_DEBUG_DUMP_PCM_DATA_PATH "/tmp/"
    70 # endif
    71 #endif
    7258
    7359#if defined(VBOX_WITH_HP_HDA)
    … …  
    40384024            }
    40394025
    4040 #ifdef HDA_DEBUG_DUMP_PCM_DATA
     4026#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    40414027            RTFILE fh;
    40424028            RTFileOpen(&fh,
    40434029                         hdaGetDirFromSD(pStream->u8SD) == PDMAUDIODIR_OUT
    4044                        ? HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaDMARead.pcm" : HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaDMAWrite.pcm",
     4030                       ? VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaDMARead.pcm" : VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaDMAWrite.pcm",
    40454031                       RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    40464032            RTFileWrite(fh, (uint8_t *)pvBuf + cbTotal, cbChunk, NULL);
    … …  
    41724158        Log2Func(("[SD%RU8]: %zu/%zu bytes written\n", pStream->u8SD, cbWritten, cbDst));
    41734159
    4174 #ifdef HDA_DEBUG_DUMP_PCM_DATA
     4160#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    41754161        RTFILE fh;
    4176         RTFileOpen(&fh, HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamWrite.pcm",
     4162        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamWrite.pcm",
    41774163                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    41784164        RTFileWrite(fh, pvDst, cbWritten, NULL);
    … …  
    42294215        Log2Func(("[SD%RU8]: Reading %zu bytes ...\n", pStream->u8SD, cbSrc));
    42304216
    4231 #ifdef HDA_DEBUG_DUMP_PCM_DATA
     4217#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    42324218        RTFILE fh;
    4233         RTFileOpen(&fh, HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamRead.pcm",
     4219        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamRead.pcm",
    42344220                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    42354221        RTFileWrite(fh, pvSrc, cbSrc, NULL);
    … …  
    65116497# endif
    65126498
    6513 #ifdef HDA_DEBUG_DUMP_PCM_DATA
    6514     RTFileDelete(HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaDMARead.pcm");
    6515     RTFileDelete(HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaDMAWrite.pcm");
    6516     RTFileDelete(HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamRead.pcm");
    6517     RTFileDelete(HDA_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamWrite.pcm");
     6499#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
     6500    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaDMARead.pcm");
     6501    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaDMAWrite.pcm");
     6502    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamRead.pcm");
     6503    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamWrite.pcm");
    65186504#endif
    65196505

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

    r67059 r67362  
    55
    66/*
    7  * Copyright (C) 2006-2016 Oracle Corporation
     7 * Copyright (C) 2006-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4646*   Defined Constants And Macros                                                                                                 *
    4747*********************************************************************************************************************************/
    48 
    49 #ifdef DEBUG_andy
    50 /*
    51  * AC97_DEBUG_DUMP_PCM_DATA enables dumping the raw PCM data
    52  * to a file on the host. Be sure to adjust AC97_DEBUG_DUMP_PCM_DATA_PATH
    53  * to your needs before using this!
    54  */
    55 # define AC97_DEBUG_DUMP_PCM_DATA
    56 # ifdef RT_OS_WINDOWS
    57 #  define AC97_DEBUG_DUMP_PCM_DATA_PATH "c:\\temp\\"
    58 # else
    59 #  define AC97_DEBUG_DUMP_PCM_DATA_PATH "/tmp/"
    60 # endif
    61 #endif
    6248
    6349/** Current saved state version. */
    … …  
    885871        AssertRC(rc2);
    886872
    887 #ifdef AC97_DEBUG_DUMP_PCM_DATA
     873#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    888874        RTFILE fh;
    889         RTFileOpen(&fh, AC97_DEBUG_DUMP_PCM_DATA_PATH "ichac97StreamWrite.pcm",
     875        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ichac97StreamWrite.pcm",
    890876                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    891877        RTFileWrite(fh, pvDst, cbRead, NULL);
    … …  
    933919    if (cbSrc)
    934920    {
    935 #ifdef AC97_DEBUG_DUMP_PCM_DATA
     921#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    936922        RTFILE fh;
    937         RTFileOpen(&fh, AC97_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamRead.pcm",
     923        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamRead.pcm",
    938924                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    939925        RTFileWrite(fh, pvSrc, cbSrc, NULL);
    … …  
    22772263            break;
    22782264
    2279 #ifdef AC97_DEBUG_DUMP_PCM_DATA
     2265#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    22802266        RTFILE fh;
    22812267        RTFileOpen(&fh,
    22822268                     pStream->u8SD == AC97SOUNDSOURCE_PO_INDEX
    2283                    ? AC97_DEBUG_DUMP_PCM_DATA_PATH "ac97DMARead.pcm" : AC97_DEBUG_DUMP_PCM_DATA_PATH "ac97DMAWrite.pcm",
     2269                   ? VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97DMARead.pcm" : VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97DMAWrite.pcm",
    22842270                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    22852271        RTFileWrite(fh, (uint8_t *)pvBuf + cbTotal, cbChunk, NULL);
    … …  
    36713657#endif
    36723658
    3673 #ifdef AC97_DEBUG_DUMP_PCM_DATA
    3674     RTFileDelete(AC97_DEBUG_DUMP_PCM_DATA_PATH "ac97DMARead.pcm");
    3675     RTFileDelete(AC97_DEBUG_DUMP_PCM_DATA_PATH "ac97DMAWrite.pcm");
    3676     RTFileDelete(AC97_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamRead.pcm");
    3677     RTFileDelete(AC97_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamWrite.pcm");
     3659#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
     3660    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97DMARead.pcm");
     3661    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97DMAWrite.pcm");
     3662    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamRead.pcm");
     3663    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamWrite.pcm");
    36783664#endif
    36793665

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

    r65624 r67362  
    55
    66/*
    7  * Copyright (C) 2015-2016 Oracle Corporation
     7 * Copyright (C) 2015-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    5858#include "DrvAudio.h"
    5959
    60 #if 0
    61 /*
    62  * SB16_DEBUG_DUMP_PCM_DATA enables dumping the raw PCM data
    63  * to a file on the host. Be sure to adjust SB16_DEBUG_DUMP_PCM_DATA_PATH
    64  * to your needs before using this!
    65  */
    66 # define SB16_DEBUG_DUMP_PCM_DATA
    67 # ifdef RT_OS_WINDOWS
    68 #  define SB16_DEBUG_DUMP_PCM_DATA_PATH "c:\\temp\\"
    69 # else
    70 #  define SB16_DEBUG_DUMP_PCM_DATA_PATH "/tmp/"
    71 # endif
    72 #endif
    73 
    7460/** Current saved state version. */
    7561#define SB16_SAVE_STATE_VERSION         2
    … …  
    16631649        AssertMsgRC(rc, ("DMAReadMemory -> %Rrc\n", rc));
    16641650
    1665 #ifdef SB16_DEBUG_DUMP_PCM_DATA
     1651#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    16661652        RTFILE fh;
    1667         RTFileOpen(&fh, SB16_DEBUG_DUMP_PCM_DATA_PATH "sb16WriteAudio.pcm",
     1653        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "sb16WriteAudio.pcm",
    16681654                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    16691655        RTFileWrite(fh, tmpbuf, cbToRead, NULL);
    … …  
    25132499    }
    25142500#endif /* VBOX_WITH_AUDIO_SB16_CALLBACKS */
     2501
     2502#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
     2503    RTFileDelete(VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "sb16WriteAudio.pcm");
     2504#endif
    25152505
    25162506    return VINF_SUCCESS;

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

    r65738 r67362  
    5454#include <VBox/vmm/pdm.h>
    5555#include <VBox/vmm/pdmaudioifs.h>
     56
     57#ifdef DEBUG_andy
     58# define VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
     59#endif
     60
     61#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
     62# ifdef RT_OS_WINDOWS
     63#  define VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "c:\\temp\\"
     64# else
     65#  define VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "/tmp/"
     66# endif
     67#endif /* VBOX_AUDIO_DEBUG_DUMP_PCM_DATA */
    5668
    5769typedef enum

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

    r65765 r67362  
    3838#include <AudioToolbox/AudioToolbox.h>
    3939
    40 #if 0
    41 # include <iprt/file.h>
    42 # define DEBUG_DUMP_PCM_DATA
    43 # ifdef RT_OS_WINDOWS
    44 #  define DEBUG_DUMP_PCM_DATA_PATH "c:\\temp\\"
    45 # else
    46 #  define DEBUG_DUMP_PCM_DATA_PATH "/tmp/"
    47 # endif
    48 #endif
    49 
    5040/* Enables utilizing the Core Audio converter unit for converting
    5141 * input / output from/to our requested formats. That might be more
    … …  
    5343/** @todo Needs more investigation and testing first before enabling. */
    5444//# define VBOX_WITH_AUDIO_CA_CONVERTER
    55 
    56 #ifdef DEBUG_andy
    57 # undef  DEBUG_DUMP_PCM_DATA_PATH
    58 # define DEBUG_DUMP_PCM_DATA_PATH "/Users/anloeffl/Documents/"
    59 # undef  VBOX_WITH_AUDIO_CA_CONVERTER
    60 #endif
    6145
    6246/** @todo
    … …  
    12051189            ioData->mBuffers[0].mData           = pvAvail;
    12061190
    1207 #ifdef DEBUG_DUMP_PCM_DATA
     1191#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    12081192            RTFILE fh;
    1209             int rc = RTFileOpen(&fh, DEBUG_DUMP_PCM_DATA_PATH "ca-converter-cb-input.pcm",
     1193            int rc = RTFileOpen(&fh,VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "caConverterCbInput.pcm",
    12101194                                RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    12111195            if (RT_SUCCESS(rc))
    … …  
    19591943            RTCircBufAcquireReadBlock(pCAStream->pCircBuf, cbToWrite, (void **)&pvChunk, &cbChunk);
    19601944            if (cbChunk)
    1961             {
    1962 #ifdef DEBUG_DUMP_PCM_DATA
    1963                 RTFILE fh;
    1964                 rc = RTFileOpen(&fh, DEBUG_DUMP_PCM_DATA_PATH "ca-capture.pcm",
    1965                                 RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    1966                 if (RT_SUCCESS(rc))
    1967                 {
    1968                     RTFileWrite(fh, pvChunk, cbChunk, NULL);
    1969                     RTFileClose(fh);
    1970                 }
    1971                 else
    1972                     AssertFailed();
    1973 #endif
    19741945                memcpy((uint8_t *)pvBuf + cbReadTotal, pvChunk, cbChunk);
    1975             }
    19761946
    19771947            /* Release the read buffer, so it could be used for new data. */
    … …  
    20642034        memcpy(pvChunk, (uint8_t *)pvBuf + cbWrittenTotal, cbChunk);
    20652035
    2066 #ifdef DEBUG_DUMP_PCM_DATA
     2036#ifdefVBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    20672037        RTFILE fh;
    2068         rc = RTFileOpen(&fh, DEBUG_DUMP_PCM_DATA_PATH "ca-playback.pcm",
     2038        rc = RTFileOpen(&fh,VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ca-playback.pcm",
    20692039                        RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    20702040        if (RT_SUCCESS(rc))

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

    r65737 r67362  
    227227
    228228        memcpy(pStreamDbg->Out.auPlayBuffer, (uint8_t *)pvBuf + cbWrittenTotal, cbChunk);
    229 #if 0
     229
     230#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
    230231        RTFILE fh;
    231         RTFileOpen(&fh, "/tmp/AudioDebug-Output.pcm",
     232        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "AudioDebugOutput.pcm",
    232233                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
    233         RTFileWrite(fh, pStreamDbg->Out.pu8PlayBuffer, cbChunk, NULL);
     234        RTFileWrite(fh, pStreamDbg->Out.auPlayBuffer, cbChunk, NULL);
    234235        RTFileClose(fh);
    235236#endif
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