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

Commit e03dd227 authored by Glenn Kasten's avatar Glenn Kasten Committed by Glenn Kasten
Browse files

When passing a size_t via binder, use 64-bits unconditionally 

64-bits is almost always over-kill.  But it's easier and cleaner to change
the binder code to be accurate, than to rename all the the API parameter
types to be 32-bit.

Bug: 12381724
Change-Id: Ib8f198d814a2027760ef24e9e3feacee21a973b1
parent af191eb4

media/libmedia/IAudioFlinger.cpp

+10 −10
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public: 
        data.writeInt32(sampleRate);

        data.writeInt32(format);

        data.writeInt32(channelMask);

        data.writeInt32(frameCount);

        data.writeInt64(frameCount);

        track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT;

        data.writeInt32(lFlags);

        if (sharedBuffer != 0) {
@@ -163,7 +163,7 @@ public: 
        data.writeInt32(sampleRate);

        data.writeInt32(format);

        data.writeInt32(channelMask);

        data.writeInt32(frameCount);

        data.writeInt64(frameCount);

        track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT;

        data.writeInt32(lFlags);

        data.writeInt32((int32_t) tid);
@@ -228,7 +228,7 @@ public: 
        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        data.writeInt32((int32_t) output);

        remote()->transact(FRAME_COUNT, data, &reply);

        return reply.readInt32();

        return reply.readInt64();

    }



    virtual uint32_t latency(audio_io_handle_t output) const
@@ -378,7 +378,7 @@ public: 
        data.writeInt32(format);

        data.writeInt32(channelMask);

        remote()->transact(GET_INPUTBUFFERSIZE, data, &reply);

        return reply.readInt32();

        return reply.readInt64();

    }



    virtual audio_io_handle_t openOutput(audio_module_handle_t module,
@@ -726,7 +726,7 @@ public: 
        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        remote()->transact(GET_PRIMARY_OUTPUT_FRAME_COUNT, data, &reply);

        return reply.readInt32();

        return reply.readInt64();

    }



    virtual status_t setLowRamDevice(bool isLowRamDevice)
@@ -754,7 +754,7 @@ status_t BnAudioFlinger::onTransact( 
            uint32_t sampleRate = data.readInt32();

            audio_format_t format = (audio_format_t) data.readInt32();

            audio_channel_mask_t channelMask = data.readInt32();

            size_t frameCount = data.readInt32();

            size_t frameCount = data.readInt64();

            track_flags_t flags = (track_flags_t) data.readInt32();

            bool haveSharedBuffer = data.readInt32() != 0;

            sp<IMemory> buffer;
@@ -791,7 +791,7 @@ status_t BnAudioFlinger::onTransact( 
            uint32_t sampleRate = data.readInt32();

            audio_format_t format = (audio_format_t) data.readInt32();

            audio_channel_mask_t channelMask = data.readInt32();

            size_t frameCount = data.readInt32();

            size_t frameCount = data.readInt64();

            track_flags_t flags = (track_flags_t) data.readInt32();

            pid_t tid = (pid_t) data.readInt32();

            int sessionId = data.readInt32();
@@ -817,7 +817,7 @@ status_t BnAudioFlinger::onTransact( 
        } break;

        case FRAME_COUNT: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            reply->writeInt32( frameCount((audio_io_handle_t) data.readInt32()) );

            reply->writeInt64( frameCount((audio_io_handle_t) data.readInt32()) );

            return NO_ERROR;

        } break;

        case LATENCY: {
@@ -916,7 +916,7 @@ status_t BnAudioFlinger::onTransact( 
            uint32_t sampleRate = data.readInt32();

            audio_format_t format = (audio_format_t) data.readInt32();

            audio_channel_mask_t channelMask = data.readInt32();

            reply->writeInt32( getInputBufferSize(sampleRate, format, channelMask) );

            reply->writeInt64( getInputBufferSize(sampleRate, format, channelMask) );

            return NO_ERROR;

        } break;

        case OPEN_OUTPUT: {
@@ -1119,7 +1119,7 @@ status_t BnAudioFlinger::onTransact( 
        } break;

        case GET_PRIMARY_OUTPUT_FRAME_COUNT: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            reply->writeInt32(getPrimaryOutputFrameCount());

            reply->writeInt64(getPrimaryOutputFrameCount());

            return NO_ERROR;

        } break;

        case SET_LOW_RAM_DEVICE: {

media/libmedia/IAudioFlingerClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public: 
            data.writeInt32(desc->samplingRate);

            data.writeInt32(desc->format);

            data.writeInt32(desc->channelMask);

            data.writeInt32(desc->frameCount);

            data.writeInt64(desc->frameCount);

            data.writeInt32(desc->latency);

        }

        remote()->transact(IO_CONFIG_CHANGED, data, &reply, IBinder::FLAG_ONEWAY);
@@ -85,7 +85,7 @@ status_t BnAudioFlingerClient::onTransact( 
                desc.samplingRate = data.readInt32();

                desc.format = (audio_format_t) data.readInt32();

                desc.channelMask = (audio_channel_mask_t) data.readInt32();

                desc.frameCount = data.readInt32();

                desc.frameCount = data.readInt64();

                desc.latency = data.readInt32();

                param2 = &desc;

            }

media/libmedia/IAudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public: 
    virtual status_t allocateTimedBuffer(size_t size, sp<IMemory>* buffer) {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioTrack::getInterfaceDescriptor());

        data.writeInt32(size);

        data.writeInt64(size);

        status_t status = remote()->transact(ALLOCATE_TIMED_BUFFER,

                                             data, &reply);

        if (status == NO_ERROR) {
@@ -232,7 +232,7 @@ status_t BnAudioTrack::onTransact( 
        case ALLOCATE_TIMED_BUFFER: {

            CHECK_INTERFACE(IAudioTrack, data, reply);

            sp<IMemory> buffer;

            status_t status = allocateTimedBuffer(data.readInt32(), &buffer);

            status_t status = allocateTimedBuffer(data.readInt64(), &buffer);

            reply->writeInt32(status);

            if (status == NO_ERROR) {

                reply->writeStrongBinder(buffer->asBinder());

media/libmedia/IMediaLogService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public: 
        Parcel data, reply;

        data.writeInterfaceToken(IMediaLogService::getInterfaceDescriptor());

        data.writeStrongBinder(shared->asBinder());

        data.writeInt32((int32_t) size);

        data.writeInt64((int64_t) size);

        data.writeCString(name);

        status_t status = remote()->transact(REGISTER_WRITER, data, &reply);

        // FIXME ignores status
@@ -71,7 +71,7 @@ status_t BnMediaLogService::onTransact( 
        case REGISTER_WRITER: {

            CHECK_INTERFACE(IMediaLogService, data, reply);

            sp<IMemory> shared = interface_cast<IMemory>(data.readStrongBinder());

            size_t size = (size_t) data.readInt32();

            size_t size = (size_t) data.readInt64();

            const char *name = data.readCString();

            registerWriter(shared, size, name);

            return NO_ERROR;

media/libmedia/IMediaMetadataRetriever.cpp

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public: 
            data.writeInt32(0);

        } else {

            // serialize the headers

            data.writeInt32(headers->size());

            data.writeInt64(headers->size());

            for (size_t i = 0; i < headers->size(); ++i) {

                data.writeString8(headers->keyAt(i));

                data.writeString8(headers->valueAt(i));
@@ -198,8 +198,8 @@ status_t BnMediaMetadataRetriever::onTransact( 
            const char* srcUrl = data.readCString();



            KeyedVector<String8, String8> headers;

            int32_t numHeaders = data.readInt32();

            for (int i = 0; i < numHeaders; ++i) {

            size_t numHeaders = (size_t) data.readInt64();

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

                String8 key = data.readString8();

                String8 value = data.readString8();

                headers.add(key, value);