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

Commit 3643b65b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-a4f311f4-769c-4b62-a9ec-97e027ca869d-for-git_oc-dr1-release-39...

release-request-a4f311f4-769c-4b62-a9ec-97e027ca869d-for-git_oc-dr1-release-3973849 snap-temp-L88500000060454810

Change-Id: I605a85dfd530c396b0ba8cad889592639f87c263
parents 17bfa43e e7cd4898
Loading
Loading
Loading
Loading
+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;
}
+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;
+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)
+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);
    }

    /**
+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;
}
Loading