diff options
author | John Grossman <johngro@google.com> | 2012-08-06 13:50:00 -0700 |
---|---|---|
committer | John Grossman <johngro@google.com> | 2012-08-13 09:48:56 -0700 |
commit | 8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b (patch) | |
tree | 5a85d007f81c1d09f68f3894f8cbb0a950372250 /media/libmediaplayerservice | |
parent | 44a7e42f0310831e6a846d1b6bb40bf3a399bf6d (diff) | |
download | frameworks_av-8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b.zip frameworks_av-8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b.tar.gz frameworks_av-8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b.tar.bz2 |
Move the AAH RTP code out of framework and into vendor.
Relocate the AAH RTP code from framework/av into
vendor/google_devices/phantasm. This change is the deletion, there
will be a separate CL which re-introduces on the vendor side of
things.
Change-Id: Ibe7e6d4b633a3886b87a615691a2692f2382af6c
Signed-off-by: John Grossman <johngro@google.com>
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/Android.mk | 3 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerFactory.cpp | 65 |
2 files changed, 1 insertions, 67 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index e3134d1..1373d3c 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -32,8 +32,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright_omx \ libstagefright_foundation \ libgui \ - libdl \ - libaah_rtp + libdl LOCAL_STATIC_LIBRARIES := \ libstagefright_nuplayer \ diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp index dcb347f..f821cc3 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp @@ -33,9 +33,6 @@ namespace android { -extern sp<MediaPlayerBase> createAAH_TXPlayer(); -extern sp<MediaPlayerBase> createAAH_RXPlayer(); - Mutex MediaPlayerFactory::sLock; MediaPlayerFactory::tFactoryMap MediaPlayerFactory::sFactoryMap; bool MediaPlayerFactory::sInitComplete = false; @@ -325,63 +322,6 @@ class TestPlayerFactory : public MediaPlayerFactory::IFactory { } }; -class AAH_RX_PlayerFactory : public MediaPlayerFactory::IFactory { - public: - virtual float scoreFactory(const sp<IMediaPlayer>& client, - const char* url, - float curScore) { - static const float kOurScore = 0.6; - - if (kOurScore <= curScore) - return 0.0; - - if (!strncasecmp("aahRX://", url, 8)) { - return kOurScore; - } - - return 0.0; - } - - virtual sp<MediaPlayerBase> createPlayer() { - ALOGV(" create A@H RX Player"); - return createAAH_RXPlayer(); - } -}; - -class AAH_TX_PlayerFactory : public MediaPlayerFactory::IFactory { - public: - virtual float scoreFactory(const sp<IMediaPlayer>& client, - const char* url, - float curScore) { - return checkRetransmitEndpoint(client) ? 1.1 : 0.0; - } - - virtual float scoreFactory(const sp<IMediaPlayer>& client, - int fd, - int64_t offset, - int64_t length, - float curScore) { - return checkRetransmitEndpoint(client) ? 1.1 : 0.0; - } - - virtual sp<MediaPlayerBase> createPlayer() { - ALOGV(" create A@H TX Player"); - return createAAH_TXPlayer(); - } - - private: - bool checkRetransmitEndpoint(const sp<IMediaPlayer>& client) { - if (client == NULL) - return false; - - struct sockaddr_in junk; - if (OK != client->getRetransmitEndpoint(&junk)) - return false; - - return true; - } -}; - void MediaPlayerFactory::registerBuiltinFactories() { Mutex::Autolock lock_(&sLock); @@ -393,11 +333,6 @@ void MediaPlayerFactory::registerBuiltinFactories() { registerFactory_l(new SonivoxPlayerFactory(), SONIVOX_PLAYER); registerFactory_l(new TestPlayerFactory(), TEST_PLAYER); - // TODO: remove this once AAH players have been relocated from - // framework/base and into vendor/google_devices/phantasm - registerFactory_l(new AAH_RX_PlayerFactory(), AAH_RX_PLAYER); - registerFactory_l(new AAH_TX_PlayerFactory(), AAH_TX_PLAYER); - sInitComplete = true; } |