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

Commit 5fd223de authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audio: Check result from oneway calls" into rvc-dev am: 6d0d85d9 am:... 

Merge "audio: Check result from oneway calls" into rvc-dev am: 6d0d85d9 am: 5e45410c am: bf9c96f8

Change-Id: I46fa36ce826e6ada42d0a0435a0c68e8b1d40cf7
parents e6788150 bf9c96f8

audio/core/all-versions/default/StreamOut.cpp

+8 −4
Original line number Original line Diff line number Diff line
@@ -455,20 +455,22 @@ int StreamOut::asyncCallback(stream_callback_event_t event, void*, void* cookie) 
    sp<IStreamOutCallback> callback = self->mCallback;

    sp<IStreamOutCallback> callback = self->mCallback;

    if (callback.get() == nullptr) return 0;

    if (callback.get() == nullptr) return 0;

    ALOGV("asyncCallback() event %d", event);

    ALOGV("asyncCallback() event %d", event);

    Return<void> result;

    switch (event) {

    switch (event) {

        case STREAM_CBK_EVENT_WRITE_READY:

        case STREAM_CBK_EVENT_WRITE_READY:

            callback->onWriteReady();

            result = callback->onWriteReady();

            break;

            break;

        case STREAM_CBK_EVENT_DRAIN_READY:

        case STREAM_CBK_EVENT_DRAIN_READY:

            callback->onDrainReady();

            result = callback->onDrainReady();

            break;

            break;

        case STREAM_CBK_EVENT_ERROR:

        case STREAM_CBK_EVENT_ERROR:

            callback->onError();

            result = callback->onError();

            break;

            break;

        default:

        default:

            ALOGW("asyncCallback() unknown event %d", event);

            ALOGW("asyncCallback() unknown event %d", event);

            break;

            break;

    }

    }

    ALOGW_IF(!result.isOk(), "Client callback failed: %s", result.description().c_str());

    return 0;

    return 0;

}

}
@@ -629,16 +631,18 @@ int StreamOut::asyncEventCallback(stream_event_callback_type_t event, void* para 
    sp<IStreamOutEventCallback> eventCallback = self->mEventCallback;

    sp<IStreamOutEventCallback> eventCallback = self->mEventCallback;

    if (eventCallback.get() == nullptr) return 0;

    if (eventCallback.get() == nullptr) return 0;

    ALOGV("%s event %d", __func__, event);

    ALOGV("%s event %d", __func__, event);

    Return<void> result;

    switch (event) {

    switch (event) {

        case STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED: {

        case STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED: {

            hidl_vec<uint8_t> audioMetadata;

            hidl_vec<uint8_t> audioMetadata;

            audioMetadata.setToExternal((uint8_t*)param, strlen((char*)param));

            audioMetadata.setToExternal((uint8_t*)param, strlen((char*)param));

            eventCallback->onCodecFormatChanged(audioMetadata);

            result = eventCallback->onCodecFormatChanged(audioMetadata);

        } break;

        } break;

        default:

        default:

            ALOGW("%s unknown event %d", __func__, event);

            ALOGW("%s unknown event %d", __func__, event);

            break;

            break;

    }

    }

    ALOGW_IF(!result.isOk(), "Client callback failed: %s", result.description().c_str());

    return 0;

    return 0;

}

}

#endif

#endif