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

Commit f74df70f authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Kevin Rocard
Browse files

audiohal: Prevent logspam when calling get_presentation_position 

get_presentation_position can return ENODATA if the stream
has stopped but the write is still querying the position.

Bug: 38376424
Change-Id: I9d516a19fb347843a8ec8e8e9a0f5eab0b0798e6
Test: no log messages from StreamHAL about get_presentation_position
(cherry picked from commit 96a3a19b)
parent 3dca679b

audio/2.0/default/Stream.cpp

+14 −2
Original line number Original line Diff line number Diff line
@@ -44,8 +44,20 @@ Stream::~Stream() { 
}

}





// static

// static

Result Stream::analyzeStatus(const char* funcName, int status, int ignoreError, int ignoreError2) {

Result Stream::analyzeStatus(const char* funcName, int status) {

    if (status != 0 && status != -ignoreError && status != -ignoreError2) {

    static const std::vector<int> empty;

    return analyzeStatus(funcName, status, empty);

}



template <typename T>

inline bool element_in(T e, const std::vector<T>& v) {

    return std::find(v.begin(), v.end(), e) != v.end();

}



// static

Result Stream::analyzeStatus(const char* funcName, int status,

                             const std::vector<int>& ignoreErrors) {

    if (status != 0 && (ignoreErrors.empty() || !element_in(-status, ignoreErrors))) {

        ALOGW("Error from HAL stream in function %s: %s", funcName, strerror(-status));

        ALOGW("Error from HAL stream in function %s: %s", funcName, strerror(-status));

    }

    }

    switch (status) {

    switch (status) {

audio/2.0/default/Stream.h

+6 −3
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H

#ifndef ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H

#define ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H

#define ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H





#include <vector>



#include <android/hardware/audio/2.0/IStream.h>

#include <android/hardware/audio/2.0/IStream.h>

#include <hardware/audio.h>

#include <hardware/audio.h>

#include <hidl/Status.h>

#include <hidl/Status.h>
@@ -79,8 +81,9 @@ struct Stream : public IStream, public ParametersUtil { 
    Return<Result> close()  override;

    Return<Result> close()  override;





    // Utility methods for extending interfaces.

    // Utility methods for extending interfaces.

    static Result analyzeStatus(

    static Result analyzeStatus(const char* funcName, int status);

            const char* funcName, int status, int ignoreError = OK, int ignoreError2 = OK);

    static Result analyzeStatus(const char* funcName, int status,

                                const std::vector<int>& ignoreErrors);





   private:

   private:

    audio_stream_t *mStream;

    audio_stream_t *mStream;

audio/2.0/default/StreamIn.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -416,15 +416,15 @@ Return<uint32_t> StreamIn::getInputFramesLost() { 
// static

// static

Result StreamIn::getCapturePositionImpl(audio_stream_in_t* stream,

Result StreamIn::getCapturePositionImpl(audio_stream_in_t* stream,

                                        uint64_t* frames, uint64_t* time) {

                                        uint64_t* frames, uint64_t* time) {

    // HAL may have a stub function, always returning ENOSYS, don't

    // spam the log in this case.

    static const std::vector<int> ignoredErrors{ENOSYS};

    Result retval(Result::NOT_SUPPORTED);

    Result retval(Result::NOT_SUPPORTED);

    if (stream->get_capture_position != NULL) return retval;

    if (stream->get_capture_position != NULL) return retval;

    int64_t halFrames, halTime;

    int64_t halFrames, halTime;

    retval = Stream::analyzeStatus(

    retval = Stream::analyzeStatus("get_capture_position",

        "get_capture_position",

                                   stream->get_capture_position(stream, &halFrames, &halTime),

                                   stream->get_capture_position(stream, &halFrames, &halTime),

        // HAL may have a stub function, always returning ENOSYS, don't

                                   ignoredErrors);

        // spam the log in this case.

        ENOSYS);

    if (retval == Result::OK) {

    if (retval == Result::OK) {

        *frames = halFrames;

        *frames = halFrames;

        *time = halTime;

        *time = halTime;

audio/2.0/default/StreamOut.cpp

+8 −7
Original line number Original line Diff line number Diff line
@@ -487,16 +487,17 @@ Return<Result> StreamOut::flush() { 
Result StreamOut::getPresentationPositionImpl(audio_stream_out_t* stream,

Result StreamOut::getPresentationPositionImpl(audio_stream_out_t* stream,

                                              uint64_t* frames,

                                              uint64_t* frames,

                                              TimeSpec* timeStamp) {

                                              TimeSpec* timeStamp) {

    // Don't logspam on EINVAL--it's normal for get_presentation_position

    // to return it sometimes. EAGAIN may be returned by A2DP audio HAL

    // implementation. ENODATA can also be reported while the writer is

    // continuously querying it, but the stream has been stopped.

    static const std::vector<int> ignoredErrors{EINVAL, EAGAIN, ENODATA};

    Result retval(Result::NOT_SUPPORTED);

    Result retval(Result::NOT_SUPPORTED);

    if (stream->get_presentation_position == NULL) return retval;

    if (stream->get_presentation_position == NULL) return retval;

    struct timespec halTimeStamp;

    struct timespec halTimeStamp;

    retval = Stream::analyzeStatus(

    retval = Stream::analyzeStatus("get_presentation_position",

        "get_presentation_position",

                                   stream->get_presentation_position(stream, frames, &halTimeStamp),

                                   stream->get_presentation_position(stream, frames, &halTimeStamp),

        // Don't logspam on EINVAL--it's normal for get_presentation_position

                                   ignoredErrors);

        // to return it sometimes. EAGAIN may be returned by A2DP audio HAL

        // implementation.

        EINVAL, EAGAIN);

    if (retval == Result::OK) {

    if (retval == Result::OK) {

        timeStamp->tvSec = halTimeStamp.tv_sec;

        timeStamp->tvSec = halTimeStamp.tv_sec;

        timeStamp->tvNSec = halTimeStamp.tv_nsec;

        timeStamp->tvNSec = halTimeStamp.tv_nsec;