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

Commit 4f898a91 authored by John Grossman's avatar John Grossman
Browse files

Revert "Add a way to play file descriptor data sources using the A@H transmitter media player." 

This reverts commit 64006cb1642b2ec0ee74c66007d869b884391fd1.

Back out this change in order to get ready to implement a longer term,
more media-team approved way of selecting a retransmit player.

Change-Id: I97b68b9859a174eab858598cb00d4445a14fbc17
parent a1152ccc

include/media/IMediaPlayer.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ public: 
    virtual status_t        attachAuxEffect(int effectId) = 0;

    virtual status_t        setParameter(int key, const Parcel& request) = 0;

    virtual status_t        getParameter(int key, Parcel* reply) = 0;

    virtual status_t        setMediaPlayerType(int playerType) = 0;



    // Invoke a generic method on the player by using opaque parcels

    // for the request and reply.

include/media/mediaplayer.h

+0 −3
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ public: 
            status_t        attachAuxEffect(int effectId);

            status_t        setParameter(int key, const Parcel& request);

            status_t        getParameter(int key, Parcel* reply);

            status_t        setMediaPlayerType(int playerType);



private:

            void            clear_l();
@@ -232,8 +231,6 @@ private: 
    int                         mVideoHeight;

    int                         mAudioSessionId;

    float                       mSendLevel;

    bool                        mOverridePlayerType;

    int                         mOverridePlayerTypeValue;

};



}; // namespace android

media/libmedia/IMediaPlayer.cpp

+0 −13
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ enum { 
    SET_VIDEO_SURFACETEXTURE,

    SET_PARAMETER,

    GET_PARAMETER,

    SET_MEDIA_PLAYER_TYPE,

};



class BpMediaPlayer: public BpInterface<IMediaPlayer>
@@ -292,13 +291,6 @@ public: 
        return remote()->transact(GET_PARAMETER, data, reply);

    }



    status_t setMediaPlayerType(int playerType) {

        Parcel data, reply;

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

        data.writeInt32(playerType);

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

        return reply.readInt32();

    }

};



IMPLEMENT_META_INTERFACE(MediaPlayer, "android.media.IMediaPlayer");
@@ -467,11 +459,6 @@ status_t BnMediaPlayer::onTransact( 
            CHECK_INTERFACE(IMediaPlayer, data, reply);

            return getParameter(data.readInt32(), reply);

        } break;

        case SET_MEDIA_PLAYER_TYPE: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            reply->writeInt32(setMediaPlayerType(data.readInt32()));

            return NO_ERROR;

        } break;

        default:

            return BBinder::onTransact(code, data, reply, flags);

    }

media/libmedia/mediaplayer.cpp

+2 −31
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ MediaPlayer::MediaPlayer() 
    mAudioSessionId = AudioSystem::newAudioSessionId();

    AudioSystem::acquireAudioSessionId(mAudioSessionId);

    mSendLevel = 0;

    mOverridePlayerType = false;

    mOverridePlayerTypeValue = -1;

}



MediaPlayer::~MediaPlayer()
@@ -148,14 +146,7 @@ status_t MediaPlayer::setDataSource( 
        const sp<IMediaPlayerService>& service(getMediaPlayerService());

        if (service != 0) {

            sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId));



            if (mOverridePlayerType) {

                if (NO_ERROR != player->setMediaPlayerType(mOverridePlayerTypeValue)) {

                    player.clear();

                }

            }



            if (player != 0 && NO_ERROR != player->setDataSource(url, headers)) {

            if (NO_ERROR != player->setDataSource(url, headers)) {

                player.clear();

            }

            err = attachNewPlayer(player);
@@ -171,14 +162,7 @@ status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length) 
    const sp<IMediaPlayerService>& service(getMediaPlayerService());

    if (service != 0) {

        sp<IMediaPlayer> player(service->create(getpid(), this, mAudioSessionId));



        if (mOverridePlayerType) {

            if (NO_ERROR != player->setMediaPlayerType(mOverridePlayerTypeValue)) {

                player.clear();

            }

        }



        if (player != 0 && NO_ERROR != player->setDataSource(fd, offset, length)) {

        if (NO_ERROR != player->setDataSource(fd, offset, length)) {

            player.clear();

        }

        err = attachNewPlayer(player);
@@ -615,19 +599,6 @@ status_t MediaPlayer::getParameter(int key, Parcel *reply) 
    return INVALID_OPERATION;

}



status_t MediaPlayer::setMediaPlayerType(int playerType) {

    if (!((mCurrentState & MEDIA_PLAYER_IDLE) ||

          (mCurrentState == MEDIA_PLAYER_STATE_ERROR))) {

        LOGE("attachNewPlayer called in state %d", mCurrentState);

        return INVALID_OPERATION;

    }



    mOverridePlayerType = true;

    mOverridePlayerTypeValue = playerType;



    return NO_ERROR;

}



void MediaPlayer::notify(int msg, int ext1, int ext2, const Parcel *obj)

{

    LOGV("message received msg=%d, ext1=%d, ext2=%d", msg, ext1, ext2);

media/libmediaplayerservice/MediaPlayerService.cpp

+2 −14
Original line number Diff line number Diff line
@@ -497,9 +497,6 @@ MediaPlayerService::Client::Client( 
    LOGD("create Antagonizer");

    mAntagonizer = new Antagonizer(notify, this);

#endif



    mOverridePlayerType = false;

    mOverridePlayerTypeValue = static_cast<player_type>(-1);

}



MediaPlayerService::Client::~Client()
@@ -719,8 +716,7 @@ status_t MediaPlayerService::Client::setDataSource( 
        close(fd);

        return mStatus;

    } else {

        player_type playerType = mOverridePlayerType ?

                mOverridePlayerTypeValue : getPlayerType(url);

        player_type playerType = getPlayerType(url);

        LOGV("player type = %d", playerType);



        // create the right type of player
@@ -770,8 +766,7 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 
        LOGV("calculated length = %lld", length);

    }



    player_type playerType = mOverridePlayerType ?

            mOverridePlayerTypeValue : getPlayerType(fd, offset, length);

    player_type playerType = getPlayerType(fd, offset, length);

    LOGV("player type = %d", playerType);



    // create the right type of player
@@ -1105,13 +1100,6 @@ status_t MediaPlayerService::Client::getParameter(int key, Parcel *reply) { 
    return p->getParameter(key, reply);

}



status_t MediaPlayerService::Client::setMediaPlayerType(int playerType) {

    mOverridePlayerType = true;

    mOverridePlayerTypeValue = static_cast<player_type>(playerType);



    return NO_ERROR;

}



void MediaPlayerService::Client::notify(

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

{