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

Commit 6e0d67d7 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use Format_isValid() and Format_isEqual() instead of direct comparison 

Change-Id: Ie87607aa514976947540a77775e6425c4e56e7d9
parent cc1e0e80

media/libnbaio/AudioBufferProviderSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ AudioBufferProviderSource::AudioBufferProviderSource(AudioBufferProvider *provid 
    NBAIO_Source(format), mProvider(provider), mConsumed(0)

{

    ALOG_ASSERT(provider != NULL);

    ALOG_ASSERT(format != Format_Invalid);

    ALOG_ASSERT(Format_isValid(format));

}



AudioBufferProviderSource::~AudioBufferProviderSource()

media/libnbaio/AudioStreamInSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ AudioStreamInSource::~AudioStreamInSource() 
ssize_t AudioStreamInSource::negotiate(const NBAIO_Format offers[], size_t numOffers,

                                      NBAIO_Format counterOffers[], size_t& numCounterOffers)

{

    if (mFormat == Format_Invalid) {

    if (!Format_isValid(mFormat)) {

        mStreamBufferSizeBytes = mStream->common.get_buffer_size(&mStream->common);

        audio_format_t streamFormat = mStream->common.get_format(&mStream->common);

        if (streamFormat == AUDIO_FORMAT_PCM_16_BIT) {
@@ -67,7 +67,7 @@ size_t AudioStreamInSource::framesOverrun() 


ssize_t AudioStreamInSource::read(void *buffer, size_t count)

{

    if (CC_UNLIKELY(mFormat == Format_Invalid)) {

    if (CC_UNLIKELY(!Format_isValid(mFormat))) {

        return NEGOTIATE;

    }

    ssize_t bytesRead = mStream->read(mStream, buffer, count << mBitShift);

media/libnbaio/AudioStreamOutSink.cpp

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ AudioStreamOutSink::~AudioStreamOutSink() 
ssize_t AudioStreamOutSink::negotiate(const NBAIO_Format offers[], size_t numOffers,

                                      NBAIO_Format counterOffers[], size_t& numCounterOffers)

{

    if (mFormat == Format_Invalid) {

    if (!Format_isValid(mFormat)) {

        mStreamBufferSizeBytes = mStream->common.get_buffer_size(&mStream->common);

        audio_format_t streamFormat = mStream->common.get_format(&mStream->common);

        if (streamFormat == AUDIO_FORMAT_PCM_16_BIT) {
@@ -56,7 +56,7 @@ ssize_t AudioStreamOutSink::write(const void *buffer, size_t count) 
    if (!mNegotiated) {

        return NEGOTIATE;

    }

    ALOG_ASSERT(mFormat != Format_Invalid);

    ALOG_ASSERT(Format_isValid(mFormat));

    ssize_t ret = mStream->write(mStream, buffer, count << mBitShift);

    if (ret > 0) {

        ret >>= mBitShift;

media/libnbaio/NBAIO.cpp

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ enum { 


unsigned Format_sampleRate(const NBAIO_Format& format)

{

    if (format == Format_Invalid) {

    if (!Format_isValid(format)) {

        return 0;

    }

    switch (format & Format_SR_Mask) {
@@ -82,7 +82,7 @@ unsigned Format_sampleRate(const NBAIO_Format& format) 


unsigned Format_channelCount(const NBAIO_Format& format)

{

    if (format == Format_Invalid) {

    if (!Format_isValid(format)) {

        return 0;

    }

    switch (format & Format_C_Mask) {
@@ -218,9 +218,9 @@ ssize_t NBAIO_Port::negotiate(const NBAIO_Format offers[], size_t numOffers, 
{

    ALOGV("negotiate offers=%p numOffers=%u countersOffers=%p numCounterOffers=%u",

            offers, numOffers, counterOffers, numCounterOffers);

    if (mFormat != Format_Invalid) {

    if (Format_isValid(mFormat)) {

        for (size_t i = 0; i < numOffers; ++i) {

            if (offers[i] == mFormat) {

            if (Format_isEqual(offers[i], mFormat)) {

                mNegotiated = true;

                return i;

            }

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1783,7 +1783,7 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, 
                                        popcount(inStream->common.get_channels(&inStream->common)));

        if (!mTeeSinkInputEnabled) {

            kind = TEE_SINK_NO;

        } else if (format == Format_Invalid) {

        } else if (!Format_isValid(format)) {

            kind = TEE_SINK_NO;

        } else if (mRecordTeeSink == 0) {

            kind = TEE_SINK_NEW;