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

Commit d4762a75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audiohal: Remove stale TODOs"

parents d4f09708 b0dd076c

audio/2.0/default/StreamIn.cpp

+0 −2
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ bool ReadThread::threadLoop() { 
    // This implementation doesn't return control back to the Thread until it decides to stop,

    // as the Thread uses mutexes, and this can lead to priority inversion.

    while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {

        // TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422

        uint32_t efState = 0;

        mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL), &efState);

        if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL))) {
@@ -321,7 +320,6 @@ Return<void> StreamIn::prepareForReading( 
                CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);

        return Void();

    }

    // TODO: Remove event flag management once blocking MQ is implemented. b/33815422

    status = EventFlag::createEventFlag(tempDataMQ->getEventFlagWord(), &mEfGroup);

    if (status != OK || !mEfGroup) {

        ALOGE("failed creating event flag for data MQ: %s", strerror(-status));

audio/2.0/default/StreamOut.cpp

+0 −2
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ bool WriteThread::threadLoop() { 
    // This implementation doesn't return control back to the Thread until it decides to stop,

    // as the Thread uses mutexes, and this can lead to priority inversion.

    while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {

        // TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422

        uint32_t efState = 0;

        mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY), &efState);

        if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY))) {
@@ -304,7 +303,6 @@ Return<void> StreamOut::prepareForWriting( 
                CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);

        return Void();

    }

    // TODO: Remove event flag management once blocking MQ is implemented. b/33815422

    status = EventFlag::createEventFlag(tempDataMQ->getEventFlagWord(), &mEfGroup);

    if (status != OK || !mEfGroup) {

        ALOGE("failed creating event flag for data MQ: %s", strerror(-status));

audio/common/2.0/types.hal

+2 −6
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ struct Uuid { 
enum AudioStreamType : int32_t {

    // These values must kept in sync with

    //  frameworks/base/media/java/android/media/AudioSystem.java

    // TODO: Synchronization should be done automatically by tools

    DEFAULT          = -1,

    MIN              = 0,

    VOICE_CALL       = 0,
@@ -169,10 +168,8 @@ enum AudioSessionConsts : int32_t { 
    OUTPUT_MIX = 0,

    /*

     * Application does not specify an explicit session ID to be used, and

     * requests a new session ID to be allocated TODO use unique values for

     * AUDIO_SESSION_OUTPUT_MIX and AUDIO_SESSION_ALLOCATE, after all uses have

     * been updated from 0 to the appropriate symbol, and have been tested.

     * Corresponds to AudioManager.AUDIO_SESSION_ID_GENERATE and

     * requests a new session ID to be allocated. Corresponds to

     * AudioManager.AUDIO_SESSION_ID_GENERATE and

     * AudioSystem.AUDIO_SESSION_ALLOCATE.

     */

    ALLOCATE = 0,
@@ -698,7 +695,6 @@ enum AudioInputFlag : int32_t { 
enum AudioUsage : int32_t {

    // These values must kept in sync with

    //  frameworks/base/media/java/android/media/AudioAttributes.java

    // TODO: Synchronization should be done automatically by tools

    UNKNOWN                            = 0,

    MEDIA                              = 1,

    VOICE_COMMUNICATION                = 2,

audio/effect/2.0/IEffectBufferProviderCallback.hal

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ interface IEffectBufferProviderCallback { 
     *

     * @return buffer audio buffer for processing

     */

    // TODO(mnaganov): replace with FMQ version.

    getBuffer() generates (AudioBuffer buffer);



    /*
@@ -35,6 +34,5 @@ interface IEffectBufferProviderCallback { 
     *

     * @param buffer audio buffer for processing

     */

    // TODO(mnaganov): replace with FMQ version.

    putBuffer(AudioBuffer buffer);

};

audio/effect/2.0/default/Effect.cpp

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ void Effect::effectBufferConfigToHal(const EffectBufferConfig& config, buffer_co 
    halConfig->buffer.raw = NULL;

    halConfig->samplingRate = config.samplingRateHz;

    halConfig->channels = static_cast<uint32_t>(config.channels);

    // TODO(mnaganov): The framework code currently does not use BP, implement later.

    // Note: The framework code does not use BP.

    halConfig->bufferProvider.cookie = NULL;

    halConfig->bufferProvider.getBuffer = NULL;

    halConfig->bufferProvider.releaseBuffer = NULL;