VirtualBox

Changeset 89414 in vbox for trunk


Ignore:
Timestamp:
May 31, 2021 8:24:22 PM (3 years ago)
Author:
vboxsync
Message:

Audio: Removed PDMAUDIOSTREAMMAP, PDMAUDIOSTREAMCHANNELDATA and DevHdaStreamChannel.*. The first two are covered by PDMAUDIOPCMPROPS::aidChannels and the mixer buffer. The latter I don't really know what it was supposed to do, it isn't used anywhere. bugref:9890

Location:
trunk
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/VBox/vmm/pdmaudioifs.h

    r89385 r89414  
    502502} PDMAUDIOPATH;
    503503
    504 /**
    505  * Stream channel data block.
    506  */
    507 typedef struct PDMAUDIOSTREAMCHANNELDATA
    508 {
    509     /** Circular buffer for the channel data. */
    510     PRTCIRCBUF          pCircBuf;
    511     /** Amount of audio data (in bytes) acquired for reading. */
    512     size_t              cbAcq;
    513     /** Channel data flags, PDMAUDIOSTREAMCHANNELDATA_FLAGS_XXX. */
    514     uint32_t            fFlags;
    515 } PDMAUDIOSTREAMCHANNELDATA;
    516 /** Pointer to audio stream channel data buffer. */
    517 typedef PDMAUDIOSTREAMCHANNELDATA  *PPDMAUDIOSTREAMCHANNELDATA;
    518 
    519 /** @name PDMAUDIOSTREAMCHANNELDATA_FLAGS_XXX
    520  *  @{ */
    521 /** No stream channel data flags defined. */
    522 #define PDMAUDIOSTREAMCHANNELDATA_FLAGS_NONE      UINT32_C(0)
    523 /** @} */
    524504
    525505/**
     
    592572AssertCompile(PDMAUDIOCHANNELID_REAR_RIGHT_HEIGHT - PDMAUDIOCHANNELID_FIRST_STANDARD == 17);
    593573
    594 /**
    595  * Mappings channels onto an audio stream.
    596  *
    597  * The mappings are either for a single (mono) or dual (stereo) channels onto an
    598  * audio stream (aka stream profile).  An audio stream consists of one or
    599  * multiple channels (e.g. 1 for mono, 2 for stereo), depending on the
    600  * configuration.
    601  */
    602 typedef struct PDMAUDIOSTREAMMAP
    603 {
    604     /** Array of channel IDs being handled.
    605      * @note The first (zero-based) index specifies the leftmost channel. */
    606     PDMAUDIOCHANNELID           aenmIDs[2];
    607     /** Step size (in bytes) to the channel's next frame. */
    608     uint32_t                    cbStep;
    609     /** Frame size (in bytes) of this channel. */
    610     uint32_t                    cbFrame;
    611     /** Byte offset to the first frame in the data block. */
    612     uint32_t                    offFirst;
    613     /** Byte offset to the next frame in the data block. */
    614     uint32_t                    offNext;
    615     /** Associated data buffer. */
    616     PDMAUDIOSTREAMCHANNELDATA   Data;
    617 
    618     /** @todo r=bird: I'd structure this very differently.
    619      * I would've had an array of channel descriptors like this:
    620      *
    621      * struct PDMAUDIOCHANNELDESC
    622      * {
    623      *     uint8_t      off;    //< Stream offset in bytes.
    624      *     uint8_t      id;     //< PDMAUDIOCHANNELID
    625      * };
    626      *
    627      * And I'd baked it into PDMAUDIOPCMPROPS as a fixed sized array with 16 entries
    628      * (max HDA channel count IIRC).  */
    629 } PDMAUDIOSTREAMMAP;
    630 /** Pointer to an audio stream channel mapping. */
    631 typedef PDMAUDIOSTREAMMAP *PPDMAUDIOSTREAMMAP;
    632574
    633575/**
  • trunk/src/VBox/Devices/Makefile.kmk

    r89406 r89414  
    641641        Audio/DevHdaCodec.cpp \
    642642        Audio/DevHdaStream.cpp \
    643         Audio/DevHdaStreamChannel.cpp \
    644643        Audio/AudioHlp.cpp \
    645644        Audio/AudioMixBuffer.cpp \
Note: See TracChangeset for help on using the changeset viewer.

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