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

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

Merge "audioflinger: fix metadata for OutputTrack" into tm-qpr-dev

parents a964cd24 49e39284

services/audioflinger/Threads.cpp

+1 −4
Original line number Diff line number Diff line
@@ -3136,11 +3136,8 @@ void AudioFlinger::PlaybackThread::updateMetadata_l() 
    auto backInserter = std::back_inserter(metadata.tracks);

    for (const sp<Track> &track : mActiveTracks) {

        // No track is invalid as this is called after prepareTrack_l in the same critical section

        // Do not forward metadata for PatchTrack with unspecified stream type

        if (track->streamType() != AUDIO_STREAM_PATCH) {

        track->copyMetadataTo(backInserter);

    }

    }

    sendMetadataToBackend_l(metadata);

}

services/audioflinger/Tracks.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1400,6 +1400,11 @@ void AudioFlinger::PlaybackThread::Track::setFinalVolume(float volume) 


void AudioFlinger::PlaybackThread::Track::copyMetadataTo(MetadataInserter& backInserter) const

{

    // Do not forward metadata for PatchTrack with unspecified stream type

    if (mStreamType == AUDIO_STREAM_PATCH) {

        return;

    }



    playback_track_metadata_v7_t metadata;

    metadata.base = {

            .usage = mAttr.usage,