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

Commit 8a049c2f authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "MediaPlayerService: Remove 64 bit compilation warnings" into nyc-dev

parents da65b5a3 833b4750

media/libmediaplayerservice/MediaPlayerService.cpp

+5 −5
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ bool unmarshallFilter(const Parcel& p, 


    if (p.dataAvail() < size)

    {

        ALOGE("Filter too short expected %d but got %d", size, p.dataAvail());

        ALOGE("Filter too short expected %zu but got %zu", size, p.dataAvail());

        *status = NOT_ENOUGH_DATA;

        return false;

    }
@@ -737,11 +737,11 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 
        return UNKNOWN_ERROR;

    }



    ALOGV("st_dev  = %llu", static_cast<uint64_t>(sb.st_dev));

    ALOGV("st_dev  = %llu", static_cast<unsigned long long>(sb.st_dev));

    ALOGV("st_mode = %u", sb.st_mode);

    ALOGV("st_uid  = %lu", static_cast<unsigned long>(sb.st_uid));

    ALOGV("st_gid  = %lu", static_cast<unsigned long>(sb.st_gid));

    ALOGV("st_size = %llu", sb.st_size);

    ALOGV("st_size = %llu", static_cast<unsigned long long>(sb.st_size));



    if (offset >= sb.st_size) {

        ALOGE("offset error");
@@ -749,7 +749,7 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 
    }

    if (offset + length > sb.st_size) {

        length = sb.st_size - offset;

        ALOGV("calculated length = %lld", length);

        ALOGV("calculated length = %lld", (long long)length);

    }



    player_type playerType = MediaPlayerFactory::getPlayerType(this,
@@ -1785,7 +1785,7 @@ status_t MediaPlayerService::AudioOutput::open( 


        if (!bothOffloaded) {

            if (mRecycledTrack->frameCount() != t->frameCount()) {

                ALOGV("framecount differs: %u/%u frames",

                ALOGV("framecount differs: %zu/%zu frames",

                      mRecycledTrack->frameCount(), t->frameCount());

                reuse = false;

            }

media/libmediaplayerservice/MediaRecorderClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ status_t MediaRecorderClient::setAudioEncoder(int ae) 


status_t MediaRecorderClient::setOutputFile(int fd, int64_t offset, int64_t length)

{

    ALOGV("setOutputFile(%d, %lld, %lld)", fd, offset, length);

    ALOGV("setOutputFile(%d, %lld, %lld)", fd, (long long)offset, (long long)length);

    Mutex::Autolock lock(mLock);

    if (mRecorder == NULL) {

        ALOGE("recorder is not initialized");

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+8 −7
Original line number Diff line number Diff line
@@ -143,19 +143,20 @@ status_t MetadataRetrieverClient::setDataSource(int fd, int64_t offset, int64_t 
        ALOGE("fstat(%d) failed: %d, %s", fd, ret, strerror(errno));

        return BAD_VALUE;

    }

    ALOGV("st_dev  = %llu", static_cast<uint64_t>(sb.st_dev));

    ALOGV("st_dev  = %llu", static_cast<unsigned long long>(sb.st_dev));

    ALOGV("st_mode = %u", sb.st_mode);

    ALOGV("st_uid  = %lu", static_cast<unsigned long>(sb.st_uid));

    ALOGV("st_gid  = %lu", static_cast<unsigned long>(sb.st_gid));

    ALOGV("st_size = %llu", sb.st_size);

    ALOGV("st_size = %llu", static_cast<unsigned long long>(sb.st_size));



    if (offset >= sb.st_size) {

        ALOGE("offset (%lld) bigger than file size (%llu)", offset, sb.st_size);

        ALOGE("offset (%lld) bigger than file size (%llu)",

                (long long)offset, (unsigned long long)sb.st_size);

        return BAD_VALUE;

    }

    if (offset + length > sb.st_size) {

        length = sb.st_size - offset;

        ALOGV("calculated length = %lld", length);

        ALOGV("calculated length = %lld", (long long)length);

    }



    player_type playerType =
@@ -194,7 +195,7 @@ Mutex MetadataRetrieverClient::sLock; 


sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option)

{

    ALOGV("getFrameAtTime: time(%lld us) option(%d)", timeUs, option);

    ALOGV("getFrameAtTime: time(%lld us) option(%d)", (long long)timeUs, option);

    Mutex::Autolock lock(mLock);

    Mutex::Autolock glock(sLock);

    mThumbnail.clear();
@@ -216,7 +217,7 @@ sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option) 
    }

    mThumbnail = new MemoryBase(heap, 0, size);

    if (mThumbnail == NULL) {

        ALOGE("not enough memory for VideoFrame size=%u", size);

        ALOGE("not enough memory for VideoFrame size=%zu", size);

        delete frame;

        return NULL;

    }
@@ -257,7 +258,7 @@ sp<IMemory> MetadataRetrieverClient::extractAlbumArt() 
    }

    mAlbumArt = new MemoryBase(heap, 0, size);

    if (mAlbumArt == NULL) {

        ALOGE("not enough memory for MediaAlbumArt size=%u", size);

        ALOGE("not enough memory for MediaAlbumArt size=%zu", size);

        delete albumArt;

        return NULL;

    }

media/libmediaplayerservice/StagefrightRecorder.cpp

+15 −14
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ status_t StagefrightRecorder::setInputSurface( 
}



status_t StagefrightRecorder::setOutputFile(int fd, int64_t offset, int64_t length) {

    ALOGV("setOutputFile: %d, %lld, %lld", fd, offset, length);

    ALOGV("setOutputFile: %d, %lld, %lld", fd, (long long)offset, (long long)length);

    // These don't make any sense, do they?

    CHECK_EQ(offset, 0ll);

    CHECK_EQ(length, 0ll);
@@ -415,39 +415,40 @@ status_t StagefrightRecorder::setParamVideoRotation(int32_t degrees) { 
}



status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) {

    ALOGV("setParamMaxFileDurationUs: %lld us", timeUs);

    ALOGV("setParamMaxFileDurationUs: %lld us", (long long)timeUs);



    // This is meant for backward compatibility for MediaRecorder.java

    if (timeUs <= 0) {

        ALOGW("Max file duration is not positive: %lld us. Disabling duration limit.", timeUs);

        ALOGW("Max file duration is not positive: %lld us. Disabling duration limit.",

                (long long)timeUs);

        timeUs = 0; // Disable the duration limit for zero or negative values.

    } else if (timeUs <= 100000LL) {  // XXX: 100 milli-seconds

        ALOGE("Max file duration is too short: %lld us", timeUs);

        ALOGE("Max file duration is too short: %lld us", (long long)timeUs);

        return BAD_VALUE;

    }



    if (timeUs <= 15 * 1000000LL) {

        ALOGW("Target duration (%lld us) too short to be respected", timeUs);

        ALOGW("Target duration (%lld us) too short to be respected", (long long)timeUs);

    }

    mMaxFileDurationUs = timeUs;

    return OK;

}



status_t StagefrightRecorder::setParamMaxFileSizeBytes(int64_t bytes) {

    ALOGV("setParamMaxFileSizeBytes: %lld bytes", bytes);

    ALOGV("setParamMaxFileSizeBytes: %lld bytes", (long long)bytes);



    // This is meant for backward compatibility for MediaRecorder.java

    if (bytes <= 0) {

        ALOGW("Max file size is not positive: %lld bytes. "

             "Disabling file size limit.", bytes);

             "Disabling file size limit.", (long long)bytes);

        bytes = 0; // Disable the file size limit for zero or negative values.

    } else if (bytes <= 1024) {  // XXX: 1 kB

        ALOGE("Max file size is too small: %lld bytes", bytes);

        ALOGE("Max file size is too small: %lld bytes", (long long)bytes);

        return BAD_VALUE;

    }



    if (bytes <= 100 * 1024) {

        ALOGW("Target file size (%lld bytes) is too small to be respected", bytes);

        ALOGW("Target file size (%lld bytes) is too small to be respected", (long long)bytes);

    }



    mMaxFileSizeBytes = bytes;
@@ -499,9 +500,9 @@ status_t StagefrightRecorder::setParamVideoCameraId(int32_t cameraId) { 
}



status_t StagefrightRecorder::setParamTrackTimeStatus(int64_t timeDurationUs) {

    ALOGV("setParamTrackTimeStatus: %lld", timeDurationUs);

    ALOGV("setParamTrackTimeStatus: %lld", (long long)timeDurationUs);

    if (timeDurationUs < 20000) {  // Infeasible if shorter than 20 ms?

        ALOGE("Tracking time duration too short: %lld us", timeDurationUs);

        ALOGE("Tracking time duration too short: %lld us", (long long)timeDurationUs);

        return BAD_VALUE;

    }

    mTrackEveryTimeDurationUs = timeDurationUs;
@@ -584,7 +585,7 @@ status_t StagefrightRecorder::setParamCaptureFps(float fps) { 


    // Not allowing time more than a day

    if (timeUs <= 0 || timeUs > 86400*1E6) {

        ALOGE("Time between frame capture (%lld) is out of range [0, 1 Day]", timeUs);

        ALOGE("Time between frame capture (%lld) is out of range [0, 1 Day]", (long long)timeUs);

        return BAD_VALUE;

    }
@@ -1433,7 +1434,7 @@ status_t StagefrightRecorder::setupCameraSource( 
    if (mCaptureFpsEnable) {

        if (mTimeBetweenCaptureUs < 0) {

            ALOGE("Invalid mTimeBetweenTimeLapseFrameCaptureUs value: %lld",

                mTimeBetweenCaptureUs);

                    (long long)mTimeBetweenCaptureUs);

            return BAD_VALUE;

        }
@@ -1538,7 +1539,7 @@ status_t StagefrightRecorder::setupVideoEncoder( 
        if (mCaptureFpsEnable) {

            if (mTimeBetweenCaptureUs <= 0) {

                ALOGE("Invalid mTimeBetweenCaptureUs value: %lld",

                        mTimeBetweenCaptureUs);

                        (long long)mTimeBetweenCaptureUs);

                return BAD_VALUE;

            }

            format->setInt64("time-lapse", mTimeBetweenCaptureUs);