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

Commit de6277bc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add format value for NULL offload info" into tm-dev

parents ffa5de33 6f11f9d4

media/libaudioclient/AudioTrack.cpp

+4 −2
Original line number Diff line number Diff line
@@ -728,11 +728,13 @@ status_t AudioTrack::set( 
    //  (b) we can support re-creation of offloaded tracks

    if (offloadInfo != NULL) {

        mOffloadInfoCopy = *offloadInfo;

        mOffloadInfo = &mOffloadInfoCopy;

    } else {

        mOffloadInfo = NULL;

        memset(&mOffloadInfoCopy, 0, sizeof(audio_offload_info_t));

        mOffloadInfoCopy = AUDIO_INFO_INITIALIZER;

        mOffloadInfoCopy.format = format;

        mOffloadInfoCopy.sample_rate = sampleRate;

        mOffloadInfoCopy.channel_mask = channelMask;

        mOffloadInfoCopy.stream_type = streamType;

    }



    mVolume[AUDIO_INTERLEAVE_LEFT] = 1.0f;

media/libaudioclient/include/media/AudioTrack.h

+0 −1
Original line number Diff line number Diff line
@@ -1344,7 +1344,6 @@ public: 
    sp<IMemory>             mSharedBuffer;

    transfer_type           mTransfer;

    audio_offload_info_t    mOffloadInfoCopy;

    const audio_offload_info_t* mOffloadInfo;

    audio_attributes_t      mAttributes;



    size_t                  mFrameSize;             // frame size in bytes