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

Commit b4a7a2df authored by Colin Cross's avatar Colin Cross
Browse files

libstagefright: fix 64-bit warnings 

%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.

Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
parent d4a31b8b

media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp

+6 −6
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ OMX_ERRORTYPE SoftFlacEncoder::internalSetParameter( 


            if (defParams->nPortIndex == 0) {

                if (defParams->nBufferSize > kMaxInputBufferSize) {

                    ALOGE("Input buffer size must be at most %zu bytes",

                    ALOGE("Input buffer size must be at most %d bytes",

                        kMaxInputBufferSize);

                    return OMX_ErrorUnsupportedSetting;

                }
@@ -354,12 +354,12 @@ FLAC__StreamEncoderWriteStatus SoftFlacEncoder::onEncodedFlacAvailable( 
            size_t bytes, unsigned samples,

            unsigned current_frame) {

    UNUSED_UNLESS_VERBOSE(current_frame);

    ALOGV("SoftFlacEncoder::onEncodedFlacAvailable(bytes=%d, samples=%d, curr_frame=%d)",

    ALOGV("SoftFlacEncoder::onEncodedFlacAvailable(bytes=%zu, samples=%u, curr_frame=%u)",

            bytes, samples, current_frame);



#ifdef WRITE_FLAC_HEADER_IN_FIRST_BUFFER

    if (samples == 0) {

        ALOGI(" saving %d bytes of header", bytes);

        ALOGI(" saving %zu bytes of header", bytes);

        memcpy(mHeader + mHeaderOffset, buffer, bytes);

        mHeaderOffset += bytes;// will contain header size when finished receiving header

        return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
@@ -370,7 +370,7 @@ FLAC__StreamEncoderWriteStatus SoftFlacEncoder::onEncodedFlacAvailable( 
    if ((samples == 0) || !mEncoderWriteData) {

        // called by the encoder because there's header data to save, but it's not the role

        // of this component (unless WRITE_FLAC_HEADER_IN_FIRST_BUFFER is defined)

        ALOGV("ignoring %d bytes of header data (samples=%d)", bytes, samples);

        ALOGV("ignoring %zu bytes of header data (samples=%d)", bytes, samples);

        return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;

    }
@@ -391,9 +391,9 @@ FLAC__StreamEncoderWriteStatus SoftFlacEncoder::onEncodedFlacAvailable( 
#endif



    // write encoded data

    ALOGV(" writing %d bytes of encoded data on output port", bytes);

    ALOGV(" writing %zu bytes of encoded data on output port", bytes);

    if (bytes > outHeader->nAllocLen - outHeader->nOffset - outHeader->nFilledLen) {

        ALOGE(" not enough space left to write encoded data, dropping %u bytes", bytes);

        ALOGE(" not enough space left to write encoded data, dropping %zu bytes", bytes);

        // a fatal error would stop the encoding

        return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;

    }

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 


#include "SoftMPEG4Encoder.h"



#include <inttypes.h>



namespace android {



template<class T>
@@ -725,7 +727,7 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) { 
            if (!PVEncodeVideoFrame(mHandle, &vin, &vout,

                    &modTimeMs, outPtr, &dataLength, &nLayer) ||

                !PVGetHintTrack(mHandle, &hintTrack)) {

                ALOGE("Failed to encode frame or get hink track at frame %lld",

                ALOGE("Failed to encode frame or get hink track at frame %" PRId64,

                    mNumInputFrames);

                mSignalledError = true;

                notify(OMX_EventError, OMX_ErrorUndefined, 0, 0);

media/libstagefright/httplive/LiveSession.cpp

+6 −5
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <utils/Mutex.h>



#include <ctype.h>

#include <inttypes.h>

#include <openssl/aes.h>

#include <openssl/md5.h>
@@ -168,7 +169,7 @@ status_t LiveSession::dequeueAccessUnit( 
        if (stream == STREAMTYPE_AUDIO || stream == STREAMTYPE_VIDEO) {

            int64_t timeUs;

            CHECK((*accessUnit)->meta()->findInt64("timeUs",  &timeUs));

            ALOGV("[%s] read buffer at time %lld us", streamStr, timeUs);

            ALOGV("[%s] read buffer at time %" PRId64 " us", streamStr, timeUs);



            mLastDequeuedTimeUs = timeUs;

            mRealTimeBaseUs = ALooper::GetNowUs() - timeUs;
@@ -675,7 +676,7 @@ ssize_t LiveSession::fetchFile( 


    ssize_t bytesRead = 0;

    // adjust range_length if only reading partial block

    if (block_size > 0 && (range_length == -1 || buffer->size() + block_size < range_length)) {

    if (block_size > 0 && (range_length == -1 || (int64_t)(buffer->size() + block_size) < range_length)) {

        range_length = buffer->size() + block_size;

    }

    for (;;) {
@@ -684,7 +685,7 @@ ssize_t LiveSession::fetchFile( 
        if (bufferRemaining == 0 && getSizeErr != OK) {

            bufferRemaining = 32768;



            ALOGV("increasing download buffer to %d bytes",

            ALOGV("increasing download buffer to %zu bytes",

                 buffer->size() + bufferRemaining);



            sp<ABuffer> copy = new ABuffer(buffer->size() + bufferRemaining);
@@ -697,7 +698,7 @@ ssize_t LiveSession::fetchFile( 
        size_t maxBytesToRead = bufferRemaining;

        if (range_length >= 0) {

            int64_t bytesLeftInRange = range_length - buffer->size();

            if (bytesLeftInRange < maxBytesToRead) {

            if (bytesLeftInRange < (int64_t)maxBytesToRead) {

                maxBytesToRead = bytesLeftInRange;



                if (bytesLeftInRange == 0) {
@@ -964,7 +965,7 @@ void LiveSession::changeConfiguration( 


    mPrevBandwidthIndex = bandwidthIndex;



    ALOGV("changeConfiguration => timeUs:%lld us, bwIndex:%d, pickTrack:%d",

    ALOGV("changeConfiguration => timeUs:%" PRId64 " us, bwIndex:%zu, pickTrack:%d",

          timeUs, bandwidthIndex, pickTrack);



    if (pickTrack) {

media/libstagefright/httplive/M3UParser.cpp

+5 −5
Original line number Diff line number Diff line
@@ -163,21 +163,21 @@ status_t M3UParser::MediaGroup::selectTrack(size_t index, bool select) { 


    if (select) {

        if (index >= mMediaItems.size()) {

            ALOGE("track %d does not exist", index);

            ALOGE("track %zu does not exist", index);

            return INVALID_OPERATION;

        }

        if (mSelectedIndex == (ssize_t)index) {

            ALOGE("track %d already selected", index);

            ALOGE("track %zu already selected", index);

            return BAD_VALUE;

        }

        ALOGV("selected track %d", index);

        ALOGV("selected track %zu", index);

        mSelectedIndex = index;

    } else {

        if (mSelectedIndex != (ssize_t)index) {

            ALOGE("track %d is not selected", index);

            ALOGE("track %zu is not selected", index);

            return BAD_VALUE;

        }

        ALOGV("unselected track %d", index);

        ALOGV("unselected track %zu", index);

        mSelectedIndex = -1;

    }

media/libstagefright/httplive/PlaylistFetcher.cpp

+9 −8
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <media/stagefright/Utils.h>



#include <ctype.h>

#include <inttypes.h>

#include <openssl/aes.h>

#include <openssl/md5.h>
@@ -316,7 +317,7 @@ void PlaylistFetcher::postMonitorQueue(int64_t delayUs, int64_t minDelayUs) { 
        maxDelayUs = minDelayUs;

    }

    if (delayUs > maxDelayUs) {

        ALOGV("Need to refresh playlist in %lld", maxDelayUs);

        ALOGV("Need to refresh playlist in %" PRId64 , maxDelayUs);

        delayUs = maxDelayUs;

    }

    sp<AMessage> msg = new AMessage(kWhatMonitorQueue, id());
@@ -627,7 +628,7 @@ void PlaylistFetcher::onMonitorQueue() { 


            int64_t bufferedStreamDurationUs =

                mPacketSources.valueAt(i)->getBufferedDurationUs(&finalResult);

            ALOGV("buffered %lld for stream %d",

            ALOGV("buffered %" PRId64 " for stream %d",

                    bufferedStreamDurationUs, mPacketSources.keyAt(i));

            if (bufferedStreamDurationUs > bufferedDurationUs) {

                bufferedDurationUs = bufferedStreamDurationUs;
@@ -640,7 +641,7 @@ void PlaylistFetcher::onMonitorQueue() { 
    if (!mPrepared && bufferedDurationUs > targetDurationUs && downloadMore) {

        mPrepared = true;



        ALOGV("prepared, buffered=%lld > %lld",

        ALOGV("prepared, buffered=%" PRId64 " > %" PRId64 "",

                bufferedDurationUs, targetDurationUs);

        sp<AMessage> msg = mNotify->dup();

        msg->setInt32("what", kWhatTemporarilyDoneFetching);
@@ -648,7 +649,7 @@ void PlaylistFetcher::onMonitorQueue() { 
    }



    if (finalResult == OK && downloadMore) {

        ALOGV("monitoring, buffered=%lld < %lld",

        ALOGV("monitoring, buffered=%" PRId64 " < %" PRId64 "",

                bufferedDurationUs, durationToBufferUs);

        // delay the next download slightly; hopefully this gives other concurrent fetchers

        // a better chance to run.
@@ -664,7 +665,7 @@ void PlaylistFetcher::onMonitorQueue() { 
        msg->post();



        int64_t delayUs = mPrepared ? kMaxMonitorDelayUs : targetDurationUs / 2;

        ALOGV("pausing for %lld, buffered=%lld > %lld",

        ALOGV("pausing for %" PRId64 ", buffered=%" PRId64 " > %" PRId64 "",

                delayUs, bufferedDurationUs, durationToBufferUs);

        // :TRICKY: need to enforce minimum delay because the delay to

        // refresh the playlist will become 0
@@ -738,7 +739,7 @@ void PlaylistFetcher::onDownloadNext() { 


        if (mPlaylist->isComplete() || mPlaylist->isEvent()) {

            mSeqNumber = getSeqNumberForTime(mStartTimeUs);

            ALOGV("Initial sequence number for time %lld is %d from (%d .. %d)",

            ALOGV("Initial sequence number for time %" PRId64 " is %d from (%d .. %d)",

                    mStartTimeUs, mSeqNumber, firstSeqNumberInPlaylist,

                    lastSeqNumberInPlaylist);

        } else {
@@ -772,7 +773,7 @@ void PlaylistFetcher::onDownloadNext() { 
                    delayUs = kMaxMonitorDelayUs;

                }

                ALOGV("sequence number high: %d from (%d .. %d), "

                      "monitor in %lld (retry=%d)",

                      "monitor in %" PRId64 " (retry=%d)",

                        mSeqNumber, firstSeqNumberInPlaylist,

                        lastSeqNumberInPlaylist, delayUs, mNumRetries);

                postMonitorQueue(delayUs);
@@ -797,7 +798,7 @@ void PlaylistFetcher::onDownloadNext() { 
            ALOGE("Cannot find sequence number %d in playlist "

                 "(contains %d - %d)",

                 mSeqNumber, firstSeqNumberInPlaylist,

                 firstSeqNumberInPlaylist + mPlaylist->size() - 1);

                  firstSeqNumberInPlaylist + (int32_t)mPlaylist->size() - 1);



            notifyError(ERROR_END_OF_STREAM);

            return;