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

Commit 34fb2969 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

libmedia: 64-bit compile warnings 

Change-Id: I600f062fa7148c01851023c1240c39939e648002
parent 23307f73

media/libmedia/AudioRecord.cpp

+12 −10
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "AudioRecord"



#include <inttypes.h>

#include <sys/resource.h>



#include <binder/IPCThreadState.h>

#include <media/AudioRecord.h>

#include <utils/Log.h>
@@ -468,7 +470,7 @@ status_t AudioRecord::openRecord_l(size_t epoch) 
        if (frameCount == 0) {

            frameCount = minFrameCount;

        } else if (frameCount < minFrameCount) {

            ALOGE("frameCount %u < minFrameCount %u", frameCount, minFrameCount);

            ALOGE("frameCount %zu < minFrameCount %zu", frameCount, minFrameCount);

            return BAD_VALUE;

        }
@@ -555,17 +557,17 @@ status_t AudioRecord::openRecord_l(size_t epoch) 
    mCblk = cblk;

    // note that temp is the (possibly revised) value of frameCount

    if (temp < frameCount || (frameCount == 0 && temp == 0)) {

        ALOGW("Requested frameCount %u but received frameCount %u", frameCount, temp);

        ALOGW("Requested frameCount %zu but received frameCount %zu", frameCount, temp);

    }

    frameCount = temp;



    mAwaitBoost = false;

    if (mFlags & AUDIO_INPUT_FLAG_FAST) {

        if (trackFlags & IAudioFlinger::TRACK_FAST) {

            ALOGV("AUDIO_INPUT_FLAG_FAST successful; frameCount %u", frameCount);

            ALOGV("AUDIO_INPUT_FLAG_FAST successful; frameCount %zu", frameCount);

            mAwaitBoost = true;

        } else {

            ALOGV("AUDIO_INPUT_FLAG_FAST denied by server; frameCount %u", frameCount);

            ALOGV("AUDIO_INPUT_FLAG_FAST denied by server; frameCount %zu", frameCount);

            // once denied, do not request again if IAudioRecord is re-created

            mFlags = (audio_input_flags_t) (mFlags & ~AUDIO_INPUT_FLAG_FAST);

        }
@@ -740,7 +742,7 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize) 
    if (ssize_t(userSize) < 0 || (buffer == NULL && userSize != 0)) {

        // sanity-check. user is most-likely passing an error code, and it would

        // make the return value ambiguous (actualSize vs error).

        ALOGE("AudioRecord::read(buffer=%p, size=%u (%d)", buffer, userSize, userSize);

        ALOGE("AudioRecord::read(buffer=%p, size=%zu (%zu)", buffer, userSize, userSize);

        return BAD_VALUE;

    }
@@ -921,10 +923,10 @@ nsecs_t AudioRecord::processAudioBuffer() 
        size_t nonContig;

        status_t err = obtainBuffer(&audioBuffer, requested, NULL, &nonContig);

        LOG_ALWAYS_FATAL_IF((err != NO_ERROR) != (audioBuffer.frameCount == 0),

                "obtainBuffer() err=%d frameCount=%u", err, audioBuffer.frameCount);

                "obtainBuffer() err=%d frameCount=%zu", err, audioBuffer.frameCount);

        requested = &ClientProxy::kNonBlocking;

        size_t avail = audioBuffer.frameCount + nonContig;

        ALOGV("obtainBuffer(%u) returned %u = %u + %u err %d",

        ALOGV("obtainBuffer(%u) returned %zu = %zu + %zu err %d",

                mRemainingFrames, avail, audioBuffer.frameCount, nonContig, err);

        if (err != NO_ERROR) {

            if (err == TIMED_OUT || err == WOULD_BLOCK || err == -EINTR) {
@@ -952,8 +954,8 @@ nsecs_t AudioRecord::processAudioBuffer() 


        // Sanity check on returned size

        if (ssize_t(readSize) < 0 || readSize > reqSize) {

            ALOGE("EVENT_MORE_DATA requested %u bytes but callback returned %d bytes",

                    reqSize, (int) readSize);

            ALOGE("EVENT_MORE_DATA requested %zu bytes but callback returned %zd bytes",

                    reqSize, ssize_t(readSize));

            return NS_NEVER;

        }
@@ -1092,7 +1094,7 @@ bool AudioRecord::AudioRecordThread::threadLoop() 
        ns = 1000000000LL;

        // fall through

    default:

        LOG_ALWAYS_FATAL_IF(ns < 0, "processAudioBuffer() returned %lld", ns);

        LOG_ALWAYS_FATAL_IF(ns < 0, "processAudioBuffer() returned %" PRId64, ns);

        pauseInternal(ns);

        return true;

    }

media/libmedia/AudioSystem.cpp

+3 −3
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ status_t AudioSystem::getFrameCount(audio_io_handle_t output, 
        return BAD_VALUE;

    }



    ALOGV("getFrameCount() output %d, frameCount %d", output, *frameCount);

    ALOGV("getFrameCount() output %d, frameCount %zu", output, *frameCount);



    return NO_ERROR;

}
@@ -489,7 +489,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle 


        OutputDescriptor *outputDesc =  new OutputDescriptor(*desc);

        gOutputs.add(ioHandle, outputDesc);

        ALOGV("ioConfigChanged() new output samplingRate %u, format %#x channel mask %#x frameCount %u "

        ALOGV("ioConfigChanged() new output samplingRate %u, format %#x channel mask %#x frameCount %zu "

                "latency %d",

                outputDesc->samplingRate, outputDesc->format, outputDesc->channelMask,

                outputDesc->frameCount, outputDesc->latency);
@@ -514,7 +514,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle 
        desc = (const OutputDescriptor *)param2;



        ALOGV("ioConfigChanged() new config for output %d samplingRate %u, format %#x channel mask %#x "

                "frameCount %d latency %d",

                "frameCount %zu latency %d",

                ioHandle, desc->samplingRate, desc->format,

                desc->channelMask, desc->frameCount, desc->latency);

        OutputDescriptor *outputDesc = gOutputs.valueAt(index);

media/libmedia/AudioTrack.cpp

+15 −14
Original line number Diff line number Diff line
@@ -15,12 +15,13 @@ 
** limitations under the License.

*/





//#define LOG_NDEBUG 0

#define LOG_TAG "AudioTrack"



#include <inttypes.h>

#include <math.h>

#include <sys/resource.h>



#include <audio_utils/primitives.h>

#include <binder/IPCThreadState.h>

#include <media/AudioTrack.h>
@@ -89,7 +90,7 @@ status_t AudioTrack::getMinFrameCount( 
                streamType, sampleRate);

        return BAD_VALUE;

    }

    ALOGV("getMinFrameCount=%d: afFrameCount=%d, minBufCount=%d, afSampleRate=%d, afLatency=%d",

    ALOGV("getMinFrameCount=%zu: afFrameCount=%zu, minBufCount=%d, afSampleRate=%d, afLatency=%d",

            *frameCount, afFrameCount, minBufCount, afSampleRate, afLatency);

    return NO_ERROR;

}
@@ -250,7 +251,7 @@ status_t AudioTrack::set( 
    ALOGV_IF(sharedBuffer != 0, "sharedBuffer: %p, size: %d", sharedBuffer->pointer(),

            sharedBuffer->size());



    ALOGV("set() streamType %d frameCount %u flags %04x", streamType, frameCount, flags);

    ALOGV("set() streamType %d frameCount %zu flags %04x", streamType, frameCount, flags);



    AutoMutex lock(mLock);
@@ -993,14 +994,14 @@ status_t AudioTrack::createTrack_l(size_t epoch) 


        // Ensure that buffer depth covers at least audio hardware latency

        uint32_t minBufCount = afLatency / ((1000 * afFrameCount)/afSampleRate);

        ALOGV("afFrameCount=%d, minBufCount=%d, afSampleRate=%u, afLatency=%d",

        ALOGV("afFrameCount=%zu, minBufCount=%d, afSampleRate=%u, afLatency=%d",

                afFrameCount, minBufCount, afSampleRate, afLatency);

        if (minBufCount <= nBuffering) {

            minBufCount = nBuffering;

        }



        size_t minFrameCount = (afFrameCount*mSampleRate*minBufCount)/afSampleRate;

        ALOGV("minFrameCount: %u, afFrameCount=%d, minBufCount=%d, sampleRate=%u, afSampleRate=%u"

        ALOGV("minFrameCount: %zu, afFrameCount=%zu, minBufCount=%d, sampleRate=%u, afSampleRate=%u"

                ", afLatency=%d",

                minFrameCount, afFrameCount, minBufCount, mSampleRate, afSampleRate, afLatency);
@@ -1008,7 +1009,7 @@ status_t AudioTrack::createTrack_l(size_t epoch) 
            frameCount = minFrameCount;

        } else if (frameCount < minFrameCount) {

            // not ALOGW because it happens all the time when playing key clicks over A2DP

            ALOGV("Minimum buffer size corrected from %d to %d",

            ALOGV("Minimum buffer size corrected from %zu to %zu",

                     frameCount, minFrameCount);

            frameCount = minFrameCount;

        }
@@ -1095,14 +1096,14 @@ status_t AudioTrack::createTrack_l(size_t epoch) 
        // In current design, AudioTrack client checks and ensures frame count validity before

        // passing it to AudioFlinger so AudioFlinger should not return a different value except

        // for fast track as it uses a special method of assigning frame count.

        ALOGW("Requested frameCount %u but received frameCount %u", frameCount, temp);

        ALOGW("Requested frameCount %zu but received frameCount %zu", frameCount, temp);

    }

    frameCount = temp;



    mAwaitBoost = false;

    if (mFlags & AUDIO_OUTPUT_FLAG_FAST) {

        if (trackFlags & IAudioFlinger::TRACK_FAST) {

            ALOGV("AUDIO_OUTPUT_FLAG_FAST successful; frameCount %u", frameCount);

            ALOGV("AUDIO_OUTPUT_FLAG_FAST successful; frameCount %zu", frameCount);

            mAwaitBoost = true;

            if (mSharedBuffer == 0) {

                // Theoretically double-buffering is not required for fast tracks,
@@ -1113,7 +1114,7 @@ status_t AudioTrack::createTrack_l(size_t epoch) 
                }

            }

        } else {

            ALOGV("AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %u", frameCount);

            ALOGV("AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %zu", frameCount);

            // once denied, do not request again if IAudioTrack is re-created

            mFlags = (audio_output_flags_t) (mFlags & ~AUDIO_OUTPUT_FLAG_FAST);

            if (mSharedBuffer == 0) {
@@ -1680,10 +1681,10 @@ nsecs_t AudioTrack::processAudioBuffer() 
        size_t nonContig;

        status_t err = obtainBuffer(&audioBuffer, requested, NULL, &nonContig);

        LOG_ALWAYS_FATAL_IF((err != NO_ERROR) != (audioBuffer.frameCount == 0),

                "obtainBuffer() err=%d frameCount=%u", err, audioBuffer.frameCount);

                "obtainBuffer() err=%d frameCount=%zu", err, audioBuffer.frameCount);

        requested = &ClientProxy::kNonBlocking;

        size_t avail = audioBuffer.frameCount + nonContig;

        ALOGV("obtainBuffer(%u) returned %u = %u + %u err %d",

        ALOGV("obtainBuffer(%u) returned %zu = %zu + %zu err %d",

                mRemainingFrames, avail, audioBuffer.frameCount, nonContig, err);

        if (err != NO_ERROR) {

            if (err == TIMED_OUT || err == WOULD_BLOCK || err == -EINTR ||
@@ -1718,8 +1719,8 @@ nsecs_t AudioTrack::processAudioBuffer() 


        // Sanity check on returned size

        if (ssize_t(writtenSize) < 0 || writtenSize > reqSize) {

            ALOGE("EVENT_MORE_DATA requested %u bytes but callback returned %d bytes",

                    reqSize, (int) writtenSize);

            ALOGE("EVENT_MORE_DATA requested %zu bytes but callback returned %zd bytes",

                    reqSize, ssize_t(writtenSize));

            return NS_NEVER;

        }
@@ -2105,7 +2106,7 @@ bool AudioTrack::AudioTrackThread::threadLoop() 
        ns = 1000000000LL;

        // fall through

    default:

        LOG_ALWAYS_FATAL_IF(ns < 0, "processAudioBuffer() returned %lld", ns);

        LOG_ALWAYS_FATAL_IF(ns < 0, "processAudioBuffer() returned %" PRId64, ns);

        pauseInternal(ns);

        return true;

    }

media/libmedia/AudioTrackShared.cpp

+6 −6
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ status_t ClientProxy::obtainBuffer(Buffer* buffer, const struct timespec *reques 
        // pipe should not be overfull

        if (!(0 <= filled && (size_t) filled <= mFrameCount)) {

            if (mIsOut) {

                ALOGE("Shared memory control block is corrupt (filled=%d, mFrameCount=%u); "

                ALOGE("Shared memory control block is corrupt (filled=%zd, mFrameCount=%zu); "

                        "shutting down", filled, mFrameCount);

                mIsShutdown = true;

                status = NO_INIT;
@@ -338,7 +338,7 @@ size_t ClientProxy::getFramesFilled() { 
    ssize_t filled = rear - front;

    // pipe should not be overfull

    if (!(0 <= filled && (size_t) filled <= mFrameCount)) {

        ALOGE("Shared memory control block is corrupt (filled=%d); shutting down", filled);

        ALOGE("Shared memory control block is corrupt (filled=%zd); shutting down", filled);

        return 0;

    }

    return (size_t)filled;
@@ -555,7 +555,7 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush) 
    ssize_t filled = rear - front;

    // pipe should not already be overfull

    if (!(0 <= filled && (size_t) filled <= mFrameCount)) {

        ALOGE("Shared memory control block is corrupt (filled=%d); shutting down", filled);

        ALOGE("Shared memory control block is corrupt (filled=%zd); shutting down", filled);

        mIsShutdown = true;

    }

    if (mIsShutdown) {
@@ -642,7 +642,7 @@ void ServerProxy::releaseBuffer(Buffer* buffer) 
    }

    // FIXME AudioRecord wakeup needs to be optimized; it currently wakes up client every time

    if (!mIsOut || (mAvailToClient + stepCount >= minimum)) {

        ALOGV("mAvailToClient=%u stepCount=%u minimum=%u", mAvailToClient, stepCount, minimum);

        ALOGV("mAvailToClient=%zu stepCount=%zu minimum=%zu", mAvailToClient, stepCount, minimum);

        int32_t old = android_atomic_or(CBLK_FUTEX_WAKE, &cblk->mFutex);

        if (!(old & CBLK_FUTEX_WAKE)) {

            (void) syscall(__NR_futex, &cblk->mFutex,
@@ -675,7 +675,7 @@ size_t AudioTrackServerProxy::framesReady() 
    ssize_t filled = rear - cblk->u.mStreaming.mFront;

    // pipe should not already be overfull

    if (!(0 <= filled && (size_t) filled <= mFrameCount)) {

        ALOGE("Shared memory control block is corrupt (filled=%d); shutting down", filled);

        ALOGE("Shared memory control block is corrupt (filled=%zd); shutting down", filled);

        mIsShutdown = true;

        return 0;

    }
@@ -834,7 +834,7 @@ void StaticAudioTrackServerProxy::releaseBuffer(Buffer* buffer) 
    size_t newPosition = position + stepCount;

    int32_t setFlags = 0;

    if (!(position <= newPosition && newPosition <= mFrameCount)) {

        ALOGW("%s newPosition %u outside [%u, %u]", __func__, newPosition, position, mFrameCount);

        ALOGW("%s newPosition %zu outside [%zu, %zu]", __func__, newPosition, position, mFrameCount);

        newPosition = mFrameCount;

    } else if (mState.mLoopCount != 0 && newPosition == mState.mLoopEnd) {

        if (mState.mLoopCount == -1 || --mState.mLoopCount != 0) {

media/libmedia/CharacterEncodingDetector.cpp

+5 −5
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void CharacterEncodingDetector::detectAndConvert() { 
        if (allprintable) {

            // since 'buf' is empty, ICU would return a UTF-8 matcher with low confidence, so

            // no need to even call it

            ALOGV("all tags are printable, assuming ascii (%d)", strlen(buf));

            ALOGV("all tags are printable, assuming ascii (%zu)", strlen(buf));

        } else {

            ucsdet_setText(csd, buf, strlen(buf), &status);

            int32_t matches;
@@ -267,11 +267,11 @@ const UCharsetMatch *CharacterEncodingDetector::getPreferred( 
    Vector<const UCharsetMatch*> matches;

    UErrorCode status = U_ZERO_ERROR;



    ALOGV("%d matches", nummatches);

    ALOGV("%zu matches", nummatches);

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

        const char *encname = ucsdet_getName(ucma[i], &status);

        int confidence = ucsdet_getConfidence(ucma[i], &status);

        ALOGV("%d: %s %d", i, encname, confidence);

        ALOGV("%zu: %s %d", i, encname, confidence);

        matches.push_back(ucma[i]);

    }
@@ -287,7 +287,7 @@ const UCharsetMatch *CharacterEncodingDetector::getPreferred( 
        return matches[0];

    }



    ALOGV("considering %d matches", num);

    ALOGV("considering %zu matches", num);



    // keep track of how many "special" characters result when converting the input using each

    // encoding
@@ -315,7 +315,7 @@ const UCharsetMatch *CharacterEncodingDetector::getPreferred( 
            freqcoverage = frequent_ja_coverage;

        }



        ALOGV("%d: %s %d", i, encname, confidence);

        ALOGV("%zu: %s %d", i, encname, confidence);

        UConverter *conv = ucnv_open(encname, &status);

        const char *source = input;

        const char *sourceLimit = input + len;