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

Commit 146994a1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ia2925986a631f29198010074568ef25fa42bdcd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 655395c0 de6277bc

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