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

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

Merge "TimeCheck: Disable on audio datapath calls" am: 8baf6178 am: d4fe5b98 am: 4f19080e 

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



Change-Id: Ie73192bac136dd9a3a1daa1096876eecfa25f59a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8b8a98c 4f19080e

media/libaudiohal/impl/EffectHalHidl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -93,13 +93,13 @@ status_t EffectHalHidl::setOutBuffer(const sp<EffectBufferHalInterface>& buffer) 
}



status_t EffectHalHidl::process() {

    TIME_CHECK();

    // TIME_CHECK();  // TODO(b/238654698) reenable only when optimized.



    return processImpl(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS));

}



status_t EffectHalHidl::processReverse() {

    TIME_CHECK();

    // TIME_CHECK();  // TODO(b/238654698) reenable only when optimized.



    return processImpl(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_REVERSE));

}

media/libaudiohal/impl/StreamHalHidl.cpp

+5 −5
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ status_t StreamOutHalHidl::selectPresentation(int presentationId, int programId) 
#endif



status_t StreamOutHalHidl::write(const void *buffer, size_t bytes, size_t *written) {

    TIME_CHECK();

    // TIME_CHECK();  // TODO(b/238654698) reenable only when optimized.

    if (mStream == 0) return NO_INIT;

    *written = 0;
@@ -587,7 +587,7 @@ status_t StreamOutHalHidl::prepareForWriting(size_t bufferSize) { 
}



status_t StreamOutHalHidl::getRenderPosition(uint32_t *dspFrames) {

    TIME_CHECK();

    // TIME_CHECK();  // TODO(b/238654698) reenable only when optimized.

    if (mStream == 0) return NO_INIT;

    Result retval;

    Return<void> ret = mStream->getRenderPosition(
@@ -668,7 +668,7 @@ status_t StreamOutHalHidl::flush() { 
}



status_t StreamOutHalHidl::getPresentationPosition(uint64_t *frames, struct timespec *timestamp) {

    TIME_CHECK();

    // TIME_CHECK();  // TODO(b/238654698) reenable only when optimized.

    if (mStream == 0) return NO_INIT;

    if (mWriterClient == gettid() && mCommandMQ) {

        return callWriterThread(
@@ -1012,7 +1012,7 @@ status_t StreamInHalHidl::setGain(float gain) { 
}



status_t StreamInHalHidl::read(void *buffer, size_t bytes, size_t *read) {

    TIME_CHECK();

    // TIME_CHECK();  // TODO(b/238654698) reenable only when optimized.

    if (mStream == 0) return NO_INIT;

    *read = 0;
@@ -1146,7 +1146,7 @@ status_t StreamInHalHidl::getInputFramesLost(uint32_t *framesLost) { 
}



status_t StreamInHalHidl::getCapturePosition(int64_t *frames, int64_t *time) {

    TIME_CHECK();

    // TIME_CHECK();  // TODO(b/238654698) reenable only when optimized.

    if (mStream == 0) return NO_INIT;

    if (mReaderClient == gettid() && mCommandMQ) {

        ReadParameters params;