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

Commit 3dcd00dd authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Declare methods in binder opcode order 

Change-Id: I5f624b7a51ffe1a17a67c056cf984f74e4c56eac
parent b283374c

include/media/IAudioRecord.h

+3 −3
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ class IAudioRecord : public IInterface 
public:

    DECLARE_META_INTERFACE(AudioRecord);



    /* get this tracks control block */

    virtual sp<IMemory> getCblk() const = 0;



    /* After it's created the track is not active. Call start() to

     * make it active.

     */
@@ -44,9 +47,6 @@ public: 
     * will be processed, unless flush() is called.

     */

    virtual void        stop() = 0;



    /* get this tracks control block */

    virtual sp<IMemory> getCblk() const = 0;

};



// ----------------------------------------------------------------------------

media/libmedia/IAudioRecord.cpp

+12 −11
Original line number Diff line number Diff line
@@ -42,6 +42,18 @@ public: 
    {

    }



    virtual sp<IMemory> getCblk() const

    {

        Parcel data, reply;

        sp<IMemory> cblk;

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

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

        if (status == NO_ERROR) {

            cblk = interface_cast<IMemory>(reply.readStrongBinder());

        }

        return cblk;

    }



    virtual status_t start(int /*AudioSystem::sync_event_t*/ event, int triggerSession)

    {

        Parcel data, reply;
@@ -64,17 +76,6 @@ public: 
        remote()->transact(STOP, data, &reply);

    }



    virtual sp<IMemory> getCblk() const

    {

        Parcel data, reply;

        sp<IMemory> cblk;

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

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

        if (status == NO_ERROR) {

            cblk = interface_cast<IMemory>(reply.readStrongBinder());

        }

        return cblk;

    }

};



IMPLEMENT_META_INTERFACE(AudioRecord, "android.media.IAudioRecord");

services/audioflinger/AudioFlinger.h

+2 −1
Original line number Diff line number Diff line
@@ -409,10 +409,11 @@ private: 
                                             int64_t pts);

        virtual status_t    setMediaTimeTransform(const LinearTransform& xform,

                                                  int target);

        virtual status_t    setParameters(const String8& keyValuePairs);



        virtual status_t onTransact(

            uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);



        virtual status_t    setParameters(const String8& keyValuePairs);

    private:

        const sp<PlaybackThread::Track> mTrack;

    };

services/audioflinger/Tracks.cpp

+4 −4
Original line number Diff line number Diff line
@@ -245,10 +245,6 @@ void AudioFlinger::TrackHandle::pause() { 
    mTrack->pause();

}



status_t AudioFlinger::TrackHandle::setParameters(const String8& keyValuePairs) {

    return mTrack->setParameters(keyValuePairs);

}



status_t AudioFlinger::TrackHandle::attachAuxEffect(int EffectId)

{

    return mTrack->attachAuxEffect(EffectId);
@@ -286,6 +282,10 @@ status_t AudioFlinger::TrackHandle::setMediaTimeTransform( 
        xform, static_cast<TimedAudioTrack::TargetTimeline>(target));

}



status_t AudioFlinger::TrackHandle::setParameters(const String8& keyValuePairs) {

    return mTrack->setParameters(keyValuePairs);

}



status_t AudioFlinger::TrackHandle::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{