Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9be7bde2 authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio V5: move Stream Metadata to common 



So that it can be used by the Bluetooth HAL.

Test: compile
Change-Id: I2e2b1e12e1f837183c4edbd1d330a13a67d1ecaf
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 20614ba6

audio/5.0/types.hal

+0 −33
Original line number Diff line number Diff line
@@ -122,39 +122,6 @@ enum MessageQueueFlagBits : uint32_t { 
    NOT_FULL = 1 << 1

};



/** Metadata of a playback track for a StreamOut. */

struct PlaybackTrackMetadata {

    AudioUsage usage;

    AudioContentType contentType;

    /**

     * Positive linear gain applied to the track samples. 0 being muted and 1 is no attenuation,

     * 2 means double amplification...

     * Must not be negative.

     */

    float gain;

};



/** Metadatas of the source of a StreamOut. */

struct SourceMetadata {

    vec<PlaybackTrackMetadata> tracks;

};



/** Metadata of a record track for a StreamIn. */

struct RecordTrackMetadata {

    AudioSource source;

    /**

     * Positive linear gain applied to the track samples. 0 being muted and 1 is no attenuation,

     * 2 means double amplification...

     * Must not be negative.

     */

    float gain;

};



/** Metadatas of the source of a StreamIn. */

struct SinkMetadata {

    vec<RecordTrackMetadata> tracks;

};



/*

 * Microphone information

 *

audio/common/5.0/types.hal

+33 −0
Original line number Diff line number Diff line
@@ -706,6 +706,39 @@ struct AudioConfig { 
    uint64_t frameCount;

};



/** Metadata of a playback track for a StreamOut. */

struct PlaybackTrackMetadata {

    AudioUsage usage;

    AudioContentType contentType;

    /**

     * Positive linear gain applied to the track samples. 0 being muted and 1 is no attenuation,

     * 2 means double amplification...

     * Must not be negative.

     */

    float gain;

};



/** Metadatas of the source of a StreamOut. */

struct SourceMetadata {

    vec<PlaybackTrackMetadata> tracks;

};



/** Metadata of a record track for a StreamIn. */

struct RecordTrackMetadata {

    AudioSource source;

    /**

     * Positive linear gain applied to the track samples. 0 being muted and 1 is no attenuation,

     * 2 means double amplification...

     * Must not be negative.

     */

    float gain;

};



/** Metadatas of the source of a StreamIn. */

struct SinkMetadata {

    vec<RecordTrackMetadata> tracks;

};





/*

 *

audio/core/all-versions/default/include/core/default/Device.h

+4 −1
Original line number Diff line number Diff line
@@ -60,9 +60,12 @@ using ::android::hardware::audio::CPP_VERSION::IStreamOut; 
using ::android::hardware::audio::CPP_VERSION::ParameterValue;

using ::android::hardware::audio::CPP_VERSION::Result;



#if MAJOR_VERSION >= 4

#if MAJOR_VERSION == 4

using ::android::hardware::audio::CPP_VERSION::SinkMetadata;

using ::android::hardware::audio::CPP_VERSION::SourceMetadata;

#elif MAJOR_VERSION >= 5

using ::android::hardware::audio::common::CPP_VERSION::SinkMetadata;

using ::android::hardware::audio::common::CPP_VERSION::SourceMetadata;

#endif



struct Device : public IDevice, public ParametersUtil {

audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalUtils.h

+5 −0
Original line number Diff line number Diff line
@@ -35,8 +35,13 @@ using Rotation = ::android::hardware::audio::CPP_VERSION::IPrimaryDevice::Rotati 
using ::android::hardware::audio::common::CPP_VERSION::AudioContentType;

using ::android::hardware::audio::common::CPP_VERSION::AudioUsage;

using ::android::hardware::audio::CPP_VERSION::MicrophoneInfo;

#if MAJOR_VERSION < 5

using ::android::hardware::audio::CPP_VERSION::SinkMetadata;

using ::android::hardware::audio::CPP_VERSION::SourceMetadata;

#else

using ::android::hardware::audio::common::CPP_VERSION::SinkMetadata;

using ::android::hardware::audio::common::CPP_VERSION::SourceMetadata;

#endif



struct Parameters {

    template <class T, class ReturnIn>