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

Commit 57356c2e authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android (Google) Code Review
Browse files

Merge "libmediaplayerservice: 64-bit compile warnings"

parents 1f103fc2 77342f72

media/libmediaplayerservice/MediaPlayerService.cpp

+7 −7
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay( 
    return new RemoteDisplay(client, iface.string());

}



status_t MediaPlayerService::AudioCache::dump(int fd, const Vector<String16>& args) const

status_t MediaPlayerService::AudioCache::dump(int fd, const Vector<String16>& /*args*/) const

{

    const size_t SIZE = 256;

    char buffer[SIZE];
@@ -673,8 +673,8 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 


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

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

    ALOGV("st_uid  = %lu", sb.st_uid);

    ALOGV("st_gid  = %lu", sb.st_gid);

    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);



    if (offset >= sb.st_size) {
@@ -803,7 +803,7 @@ status_t MediaPlayerService::Client::setMetadataFilter(const Parcel& filter) 
}



status_t MediaPlayerService::Client::getMetadata(

        bool update_only, bool apply_filter, Parcel *reply)

        bool update_only, bool /*apply_filter*/, Parcel *reply)

{

    sp<MediaPlayerBase> player = getPlayer();

    if (player == 0) return UNKNOWN_ERROR;
@@ -1926,8 +1926,8 @@ bool CallbackThread::threadLoop() { 
status_t MediaPlayerService::AudioCache::open(

        uint32_t sampleRate, int channelCount, audio_channel_mask_t channelMask,

        audio_format_t format, int bufferCount,

        AudioCallback cb, void *cookie, audio_output_flags_t flags,

        const audio_offload_info_t *offloadInfo)

        AudioCallback cb, void *cookie, audio_output_flags_t /*flags*/,

        const audio_offload_info_t* /*offloadInfo*/)

{

    ALOGV("open(%u, %d, 0x%x, %d, %d)", sampleRate, channelCount, channelMask, format, bufferCount);

    if (mHeap->getHeapID() < 0) {
@@ -1994,7 +1994,7 @@ status_t MediaPlayerService::AudioCache::wait() 
}



void MediaPlayerService::AudioCache::notify(

        void* cookie, int msg, int ext1, int ext2, const Parcel *obj)

        void* cookie, int msg, int ext1, int ext2, const Parcel* /*obj*/)

{

    ALOGV("notify(%p, %d, %d, %d)", cookie, msg, ext1, ext2);

    AudioCache* p = static_cast<AudioCache*>(cookie);

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ status_t MetadataRetrieverClient::setDataSource(int fd, int64_t offset, int64_t 
    }

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

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

    ALOGV("st_uid  = %lu", sb.st_uid);

    ALOGV("st_gid  = %lu", sb.st_gid);

    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);



    if (offset >= sb.st_size) {

media/libmediaplayerservice/MidiFile.cpp

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ MidiFile::~MidiFile() { 
}



status_t MidiFile::setDataSource(

        const sp<IMediaHTTPService> &httpService,

        const sp<IMediaHTTPService> & /*httpService*/,

        const char* path,

        const KeyedVector<String8, String8> *) {

    ALOGV("MidiFile::setDataSource url=%s", path);