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

Commit 9ed3682e authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Support direct PCM track latency reporting" am: 7de0d15d am: baf724ed 

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

Change-Id: Iee99ce130763ede9d5451702ca842981a8b658c4
parents d6c41481 baf724ed

services/audioflinger/PlaybackTracks.h

+6 −0
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ public: 
       }

    }



    static bool checkServerLatencySupported(

            audio_format_t format, audio_output_flags_t flags) {

        return audio_is_linear_pcm(format)

                && (flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC) == 0;

    }



    audio_output_flags_t getOutputFlags() const { return mFlags; }

    float getSpeed() const { return mSpeed; }

protected:

services/audioflinger/Tracks.cpp

+1 −2
Original line number Diff line number Diff line
@@ -713,8 +713,7 @@ AudioFlinger::PlaybackThread::Track::Track( 
        thread->mFastTrackAvailMask &= ~(1 << i);

    }



    mServerLatencySupported = thread->type() == ThreadBase::MIXER

            || thread->type() == ThreadBase::DUPLICATING;

    mServerLatencySupported = checkServerLatencySupported(format, flags);

#ifdef TEE_SINK

    mTee.setId(std::string("_") + std::to_string(mThreadIoHandle)

            + "_" + std::to_string(mId) + "_T");