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

Commit 49d24d3f authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary parameter"

parents df84d70d 8d6cc842

cmds/stagefright/stagefright.cpp

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include <stdlib.h>

#include <string.h>

#include <unistd.h>



#include "jpeg.h"

#include "SineSource.h"
@@ -821,7 +820,7 @@ int main(int argc, char **argv) { 
        CHECK(service.get() != NULL);



        sp<IMediaMetadataRetriever> retriever =

            service->createMetadataRetriever(getpid());

            service->createMetadataRetriever();



        CHECK(retriever != NULL);

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ int main(int argc, char **argv) { 
    }



    sp<IMediaPlayer> player =

        service->create(getpid(), client, 0);

        service->create(client, 0);



    if (player != NULL && player->setDataSource(source) == NO_ERROR) {

        player->setVideoSurfaceTexture(surface->getSurfaceTexture());

include/media/IAudioFlinger.h

+1 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ public: 
     * return null if the track cannot be created.

     */

    virtual sp<IAudioTrack> createTrack(

                                pid_t pid,

                                audio_stream_type_t streamType,

                                uint32_t sampleRate,

                                audio_format_t format,
@@ -70,7 +69,6 @@ public: 
                                status_t *status) = 0;



    virtual sp<IAudioRecord> openRecord(

                                pid_t pid,

                                audio_io_handle_t input,

                                uint32_t sampleRate,

                                audio_format_t format,
@@ -174,7 +172,7 @@ public: 
    virtual status_t getEffectDescriptor(const effect_uuid_t *pEffectUUID,

                                        effect_descriptor_t *pDescriptor) const = 0;



    virtual sp<IEffect> createEffect(pid_t pid,

    virtual sp<IEffect> createEffect(

                                    effect_descriptor_t *pDesc,

                                    const sp<IEffectClient>& client,

                                    int32_t priority,

include/media/IMediaPlayerService.h

+3 −3
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ class IMediaPlayerService: public IInterface 
public:

    DECLARE_META_INTERFACE(MediaPlayerService);



    virtual sp<IMediaRecorder> createMediaRecorder(pid_t pid) = 0;

    virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid) = 0;

    virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int audioSessionId = 0) = 0;

    virtual sp<IMediaRecorder> createMediaRecorder() = 0;

    virtual sp<IMediaMetadataRetriever> createMetadataRetriever() = 0;

    virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client, int audioSessionId = 0) = 0;



    virtual sp<IMemory>         decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) = 0;

    virtual sp<IMemory>         decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) = 0;

media/libmedia/AudioEffect.cpp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ status_t AudioEffect::set(const effect_uuid_t *type, 


    mIEffectClient = new EffectClient(this);



    iEffect = audioFlinger->createEffect(getpid(), &mDescriptor,

    iEffect = audioFlinger->createEffect((effect_descriptor_t *)&mDescriptor,

            mIEffectClient, priority, io, mSessionId, &mStatus, &mId, &enabled);



    if (iEffect == 0 || (mStatus != NO_ERROR && mStatus != ALREADY_EXISTS)) {