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

Commit e9a90980 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audiopolicy: fix attributes match helper function" into qt-dev

parents fa36d4b2 393f0e05

media/libaudioclient/AudioTrack.cpp

+2 −8
Original line number Diff line number Diff line
@@ -250,10 +250,7 @@ AudioTrack::AudioTrack( 
      mPreviousSchedulingGroup(SP_DEFAULT),

      mPausedPosition(0)

{

    mAttributes.content_type = AUDIO_CONTENT_TYPE_UNKNOWN;

    mAttributes.usage = AUDIO_USAGE_UNKNOWN;

    mAttributes.flags = 0x0;

    strcpy(mAttributes.tags, "");

    mAttributes = AUDIO_ATTRIBUTES_INITIALIZER;



    (void)set(streamType, sampleRate, format, channelMask,

            frameCount, flags, cbf, user, notificationFrames,
@@ -286,10 +283,7 @@ AudioTrack::AudioTrack( 
      mPausedPosition(0),

      mSelectedDeviceId(AUDIO_PORT_HANDLE_NONE)

{

    mAttributes.content_type = AUDIO_CONTENT_TYPE_UNKNOWN;

    mAttributes.usage = AUDIO_USAGE_UNKNOWN;

    mAttributes.flags = 0x0;

    strcpy(mAttributes.tags, "");

    mAttributes = AUDIO_ATTRIBUTES_INITIALIZER;



    (void)set(streamType, sampleRate, format, channelMask,

            0 /*frameCount*/, flags, cbf, user, notificationFrames,

media/libmedia/include/media/TypeConverter.h

+2 −2
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ static inline std::string toString(const audio_attributes_t& attributes) 
    result << "{ Content type: " << toString(attributes.content_type)

           << " Usage: " << toString(attributes.usage)

           << " Source: " << toString(attributes.source)

           << " Flags: " << attributes.flags

           << " Tags: " << attributes.tags

           << std::hex << " Flags: 0x" << attributes.flags

           << std::dec << " Tags: " << attributes.tags

           << " }";



    return result.str();