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

Commit 13e40274 authored by Phil Burk's avatar Phil Burk Committed by android-build-merger
Browse files

Merge "aaudio: Fix getFramesWritten() for callback mode." into oc-dev 

am: 441f2ccb

Change-Id: I748c5485cf76a8fd3e6b73696fd6cb74d4774237
parents a4804f56 441f2ccb

media/libaaudio/src/client/AudioStreamInternal.cpp

+7 −1
Original line number Diff line number Diff line
@@ -791,4 +791,10 @@ int64_t AudioStreamInternal::getFramesRead() 
    return framesRead;

}



// TODO implement getTimestamp
 
int64_t AudioStreamInternal::getFramesWritten()

{

    int64_t getFramesWritten = mAudioEndpoint.getDownDataWriteCounter()

            + mFramesOffsetFromService;

    ALOGD_IF(MYLOG_CONDITION, "AudioStreamInternal::getFramesWritten() returns %lld", (long long)getFramesWritten);

    return getFramesWritten;

}

media/libaaudio/src/client/AudioStreamInternal.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public: 
    int32_t getFramesPerBurst() const override;



    int64_t getFramesRead() override;

    int64_t getFramesWritten() override;



    int32_t getXRunCount() const override {

        return mXRunCount;

media/libaaudio/src/core/AAudioAudio.cpp

+10 −15
Original line number Diff line number Diff line
@@ -195,26 +195,21 @@ AAUDIO_API void AAudioStreamBuilder_setFramesPerDataCallback(AAudioStreamBuilder 
    streamBuilder->setFramesPerDataCallback(frames);

}



// TODO merge AAudioInternal_openStream into AAudioStreamBuilder_openStream

static aaudio_result_t  AAudioInternal_openStream(AudioStreamBuilder *streamBuilder,

AAUDIO_API aaudio_result_t  AAudioStreamBuilder_openStream(AAudioStreamBuilder* builder,

                                                     AAudioStream** streamPtr)

{

    AudioStream *audioStream = nullptr;

    ALOGD("AAudioStreamBuilder_openStream() ----------------------------------------------");

    AudioStreamBuilder *streamBuilder = COMMON_GET_FROM_BUILDER_OR_RETURN(streamPtr);

    aaudio_result_t result = streamBuilder->build(&audioStream);

    if (result != AAUDIO_OK) {

        return result;

    } else {

    ALOGD("AAudioStreamBuilder_openStream() returns %d -----------------------------------",

          result);

    if (result == AAUDIO_OK) {

        *streamPtr = (AAudioStream*) audioStream;

        return AAUDIO_OK;

    }

    } else {

        *streamPtr = nullptr;

    }



AAUDIO_API aaudio_result_t  AAudioStreamBuilder_openStream(AAudioStreamBuilder* builder,

                                                     AAudioStream** streamPtr)

{

    ALOGD("AAudioStreamBuilder_openStream() ----------------------------------------------");

    AudioStreamBuilder *streamBuilder = COMMON_GET_FROM_BUILDER_OR_RETURN(streamPtr);

    return AAudioInternal_openStream(streamBuilder, streamPtr);

    return result;

}



AAUDIO_API aaudio_result_t  AAudioStreamBuilder_delete(AAudioStreamBuilder* builder)

media/libaaudio/src/core/AudioStream.h

+2 −2
Original line number Diff line number Diff line
@@ -223,11 +223,11 @@ public: 
protected:



    virtual int64_t incrementFramesWritten(int32_t frames) {

        return static_cast<int64_t>(mFramesWritten.increment(frames));

        return mFramesWritten.increment(frames);

    }



    virtual int64_t incrementFramesRead(int32_t frames) {

        return static_cast<int64_t>(mFramesRead.increment(frames));

        return mFramesRead.increment(frames);

    }



    /**

media/libaaudio/src/core/AudioStreamBuilder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -108,5 +108,6 @@ aaudio_result_t AudioStreamBuilder::build(AudioStream** streamPtr) { 
    } else {

        *streamPtr = audioStream;

    }

    ALOGD("AudioStreamBuilder(): return %d", result);

    return result;

}