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

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

diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h
index afd4f58..e905903 100644 (file)
--- a/include/media/IMediaPlayer.h
+++ b/include/media/IMediaPlayer.h
@@ -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.

diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index ed42ee9..e6a0cc5 100644 (file)
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -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

diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp
index 859c706..9c1e6b7 100644 (file)
--- a/media/libmedia/IMediaPlayer.cpp
+++ b/media/libmedia/IMediaPlayer.cpp
@@ -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);
     }

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 325c788..c2e1ddf 100644 (file)
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -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);

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 45ffc7d..5b1d6c7 100644 (file)
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -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)
 {

diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index 9ae1d50..04d9e28 100644 (file)
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -271,7 +271,6 @@ private:
         virtual status_t        attachAuxEffect(int effectId);
         virtual status_t        setParameter(int key, const Parcel &request);
         virtual status_t        getParameter(int key, Parcel *reply);
-        virtual status_t        setMediaPlayerType(int playerType);
 
         sp<MediaPlayerBase>     createPlayer(player_type playerType);
 
@@ -345,9 +344,6 @@ private:
         // getMetadata clears this set.
         media::Metadata::Filter mMetadataUpdated;  // protected by mLock
 
-        bool mOverridePlayerType;
-        player_type mOverridePlayerTypeValue;
-
 #if CALLBACK_ANTAGONIZER
                     Antagonizer*                mAntagonizer;
 #endif