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

Commit 9841f636 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Add AudioFlinger::PlaybackThread::Track::getTimestamp()" into klp-dev

parents 56b59224 573d80a8

services/audioflinger/PlaybackTracks.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public: 
            void        setMainBuffer(int16_t *buffer) { mMainBuffer = buffer; }

            int16_t     *mainBuffer() const { return mMainBuffer; }

            int         auxEffectId() const { return mAuxEffectId; }

    virtual status_t    getTimestamp(AudioTimestamp& timestamp);



// implement FastMixerState::VolumeProvider interface

    virtual uint32_t    getVolumeLR();

services/audioflinger/Tracks.cpp

+12 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ status_t AudioFlinger::TrackHandle::setParameters(const String8& keyValuePairs) 


status_t AudioFlinger::TrackHandle::getTimestamp(AudioTimestamp& timestamp)

{

    return INVALID_OPERATION;

    return mTrack->getTimestamp(timestamp);

}



status_t AudioFlinger::TrackHandle::onTransact(
@@ -716,6 +716,17 @@ status_t AudioFlinger::PlaybackThread::Track::setParameters(const String8& keyVa 
    }

}



status_t AudioFlinger::PlaybackThread::Track::getTimestamp(AudioTimestamp& timestamp)

{

    sp<ThreadBase> thread = mThread.promote();

    if (thread == 0) {

        return false;

    }

    Mutex::Autolock _l(thread->mLock);

    PlaybackThread *playbackThread = (PlaybackThread *)thread.get();

    return INVALID_OPERATION;

}



status_t AudioFlinger::PlaybackThread::Track::attachAuxEffect(int EffectId)

{

    status_t status = DEAD_OBJECT;