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

Commit ab2f2f35 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "Set default value to mAttributes in AudioTrack" am: 1128b3fa am: 46c631d9 

am: e79290d1

Change-Id: I239ab1a947eb13195e6acbfa8f096965dd14d5ae
parents aaaa003c e79290d1

media/libaudioclient/AudioTrack.cpp

+10 −0
Original line number Diff line number Diff line
@@ -293,6 +293,11 @@ 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, "");



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

            frameCount, flags, cbf, user, notificationFrames,

            0 /*sharedBuffer*/, false /*threadCanCallJava*/, sessionId, transferType,
@@ -324,6 +329,11 @@ 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, "");



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

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

            sharedBuffer, false /*threadCanCallJava*/, sessionId, transferType, offloadInfo,