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

Commit e4a024ff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add format value for NULL offload info" am: c0845eab 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2092531



Change-Id: Iae2b5a48e29fe42454948ced938631d472cdbd45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 950482ba c0845eab

media/libaudioclient/AudioTrack.cpp

+4 −2
Original line number Diff line number Diff line
@@ -572,11 +572,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
@@ -1182,7 +1182,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