DO NOT MERGE Add the ability to dynamicaly register MediaPlayer types. (79128941) · Commits · e / os / android_frameworks_base

include/media/IMediaPlayer.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ public:
		virtual status_t setParameter(int key, const Parcel& request) = 0;
		virtual status_t getParameter(int key, Parcel* reply) = 0;
		virtual status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint) = 0;
		virtual status_t getRetransmitEndpoint(struct sockaddr_in* endpoint) = 0;

		// Invoke a generic method on the player by using opaque parcels
		// for the request and reply.

include/media/MediaPlayerInterface.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -144,12 +144,15 @@ public:
		virtual status_t getParameter(int key, Parcel *reply) = 0;

		// Right now, only the AAX TX player supports this functionality. For now,
		// provide a default implementation which indicates a lack of support for
		// this functionality to make life easier for all of the other media player
		// provide default implementations which indicate a lack of support for this
		// functionality to make life easier for all of the other media player
		// maintainers out there.
		virtual status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint) {
		return INVALID_OPERATION;
		}
		virtual status_t getRetransmitEndpoint(struct sockaddr_in* endpoint) {
		return INVALID_OPERATION;
		}

		// Invoke a generic method on the player by using opaque parcels
		// for the request and reply.

media/libmedia/IMediaPlayer.cpp

+31 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ enum {
		SET_PARAMETER,
		GET_PARAMETER,
		SET_RETRANSMIT_ENDPOINT,
		GET_RETRANSMIT_ENDPOINT,
		};

		class BpMediaPlayer: public BpInterface<IMediaPlayer>
		@@ -293,7 +294,8 @@ public:
		return remote()->transact(GET_PARAMETER, data, reply);
		}

		status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint) {
		status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint)
		{
		Parcel data, reply;
		status_t err;

		@@ -312,6 +314,23 @@ public:

		return reply.readInt32();
		}

		status_t getRetransmitEndpoint(struct sockaddr_in* endpoint)
		{
		Parcel data, reply;
		status_t err;

		data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
		err = remote()->transact(GET_RETRANSMIT_ENDPOINT, data, &reply);

		if ((OK != err) \|\| (OK != (err = reply.readInt32()))) {
		return err;
		}

		data.read(endpoint, sizeof(*endpoint));

		return err;
		}
		};

		IMPLEMENT_META_INTERFACE(MediaPlayer, "android.media.IMediaPlayer");
		@@ -494,6 +513,17 @@ status_t BnMediaPlayer::onTransact(

		return NO_ERROR;
		} break;
		case GET_RETRANSMIT_ENDPOINT: {
		CHECK_INTERFACE(IMediaPlayer, data, reply);

		struct sockaddr_in endpoint;
		status_t res = getRetransmitEndpoint(&endpoint);

		reply->writeInt32(res);
		reply->write(&endpoint, sizeof(endpoint));

		return NO_ERROR;
		} break;
		default:
		return BBinder::onTransact(code, data, reply, flags);
		}

media/libmediaplayerservice/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		MediaRecorderClient.cpp \
		MediaPlayerFactory.cpp \
		MediaPlayerService.cpp \
		MetadataRetrieverClient.cpp \
		TestPlayerStub.cpp \

media/libmediaplayerservice/MediaPlayerFactory.cpp

0 → 100644

+376 −0

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2012, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/

		#define LOG_TAG "MediaPlayerFactory"
		#include <utils/Log.h>

		#include <media/IMediaPlayer.h>
		#include <media/stagefright/MediaDebug.h>
		#include <utils/Errors.h>
		#include <utils/misc.h>

		#include "MediaPlayerFactory.h"

		#include "MidiFile.h"
		#include "TestPlayerStub.h"
		#include "StagefrightPlayer.h"
		#include "nuplayer/NuPlayerDriver.h"

		namespace android {

		extern sp<MediaPlayerBase> createAAH_TXPlayer();
		extern sp<MediaPlayerBase> createAAH_RXPlayer();

		Mutex MediaPlayerFactory::sLock;
		MediaPlayerFactory::tFactoryMap MediaPlayerFactory::sFactoryMap;
		bool MediaPlayerFactory::sInitComplete = false;

		status_t MediaPlayerFactory::registerFactory_l(IFactory* factory,
		player_type type) {
		if (NULL == factory) {
		LOGE("Failed to register MediaPlayerFactory of type %d, factory is"
		" NULL.", type);
		return BAD_VALUE;
		}

		if (sFactoryMap.indexOfKey(type) >= 0) {
		LOGE("Failed to register MediaPlayerFactory of type %d, type is already"
		" registered.", type);
		return ALREADY_EXISTS;
		}

		if (sFactoryMap.add(type, factory) < 0) {
		LOGE("Failed to register MediaPlayerFactory of type %d, failed to add"
		" to map.", type);
		return UNKNOWN_ERROR;
		}

		return OK;
		}

		status_t MediaPlayerFactory::registerFactory(IFactory* factory,
		player_type type) {
		Mutex::Autolock lock_(&sLock);
		return registerFactory_l(factory, type);
		}

		void MediaPlayerFactory::unregisterFactory(player_type type) {
		Mutex::Autolock lock_(&sLock);
		sFactoryMap.removeItem(type);
		}

		#define GET_PLAYER_TYPE_IMPL(a...) \
		Mutex::Autolock lock_(&sLock); \
		\
		/* Default player type is Stagefright */ \
		player_type ret = STAGEFRIGHT_PLAYER; \
		float bestScore = 0.0; \
		\
		for (size_t i = 0; i < sFactoryMap.size(); ++i) { \
		\
		IFactory* v = sFactoryMap.valueAt(i); \
		float thisScore; \
		CHECK(v != NULL); \
		thisScore = v->scoreFactory(a, bestScore); \
		if (thisScore > bestScore) { \
		ret = sFactoryMap.keyAt(i); \
		bestScore = thisScore; \
		} \
		} \
		return ret

		player_type MediaPlayerFactory::getPlayerType(const sp<IMediaPlayer>& client,
		const char* url) {
		GET_PLAYER_TYPE_IMPL(client, url);
		}

		player_type MediaPlayerFactory::getPlayerType(const sp<IMediaPlayer>& client,
		int fd,
		int64_t offset,
		int64_t length) {
		GET_PLAYER_TYPE_IMPL(client, fd, offset, length);
		}

		sp<MediaPlayerBase> MediaPlayerFactory::createPlayer(
		player_type playerType,
		void* cookie,
		notify_callback_f notifyFunc) {
		sp<MediaPlayerBase> p;
		IFactory* factory;
		status_t init_result;
		Mutex::Autolock lock_(&sLock);

		if (sFactoryMap.indexOfKey(playerType) < 0) {
		LOGE("Failed to create player object of type %d, no registered factory",
		playerType);
		return p;
		}

		factory = sFactoryMap.valueFor(playerType);
		CHECK(NULL != factory);
		p = factory->createPlayer();

		if (p == NULL) {
		LOGE("Failed to create player object of type %d, create failed",
		playerType);
		return p;
		}

		init_result = p->initCheck();
		if (init_result == NO_ERROR) {
		p->setNotifyCallback(cookie, notifyFunc);
		} else {
		LOGE("Failed to create player object of type %d, initCheck failed"
		" (res = %d)", playerType, init_result);
		p.clear();
		}

		return p;
		}

		/*****************************************************************************
		* *
		* Built-In Factory Implementations *
		* *
		*****************************************************************************/

		class StagefrightPlayerFactory :
		public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		int fd,
		int64_t offset,
		int64_t length,
		float curScore) {
		char buf[20];
		lseek(fd, offset, SEEK_SET);
		read(fd, buf, sizeof(buf));
		lseek(fd, offset, SEEK_SET);

		long ident = ((long)buf);

		// Ogg vorbis?
		if (ident == 0x5367674f) // 'OggS'
		return 1.0;

		return 0.0;
		}

		virtual sp<MediaPlayerBase> createPlayer() {
		LOGV(" create StagefrightPlayer");
		return new StagefrightPlayer();
		}
		};

		class NuPlayerFactory : public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		const char* url,
		float curScore) {
		static const float kOurScore = 0.8;

		if (kOurScore <= curScore)
		return 0.0;

		if (!strncasecmp("http://", url, 7)
		\|\| !strncasecmp("https://", url, 8)) {
		size_t len = strlen(url);
		if (len >= 5 && !strcasecmp(".m3u8", &url[len - 5])) {
		return kOurScore;
		}

		if (strstr(url,"m3u8")) {
		return kOurScore;
		}
		}

		if (!strncasecmp("rtsp://", url, 7)) {
		return kOurScore;
		}

		return 0.0;
		}

		virtual sp<MediaPlayerBase> createPlayer() {
		LOGV(" create NuPlayer");
		return new NuPlayerDriver;
		}
		};

		class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		const char* url,
		float curScore) {
		static const float kOurScore = 0.4;
		static const char* const FILE_EXTS[] = { ".mid",
		".midi",
		".smf",
		".xmf",
		".imy",
		".rtttl",
		".rtx",
		".ota" };
		if (kOurScore <= curScore)
		return 0.0;

		// use MidiFile for MIDI extensions
		int lenURL = strlen(url);
		for (int i = 0; i < NELEM(FILE_EXTS); ++i) {
		int len = strlen(FILE_EXTS[i]);
		int start = lenURL - len;
		if (start > 0) {
		if (!strncasecmp(url + start, FILE_EXTS[i], len)) {
		return kOurScore;
		}
		}
		}

		return 0.0;
		}

		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		int fd,
		int64_t offset,
		int64_t length,
		float curScore) {
		static const float kOurScore = 0.8;

		if (kOurScore <= curScore)
		return 0.0;

		// Some kind of MIDI?
		EAS_DATA_HANDLE easdata;
		if (EAS_Init(&easdata) == EAS_SUCCESS) {
		EAS_FILE locator;
		locator.path = NULL;
		locator.fd = fd;
		locator.offset = offset;
		locator.length = length;
		EAS_HANDLE eashandle;
		if (EAS_OpenFile(easdata, &locator, &eashandle) == EAS_SUCCESS) {
		EAS_CloseFile(easdata, eashandle);
		EAS_Shutdown(easdata);
		return kOurScore;
		}
		EAS_Shutdown(easdata);
		}

		return 0.0;
		}

		virtual sp<MediaPlayerBase> createPlayer() {
		LOGV(" create MidiFile");
		return new MidiFile();
		}
		};

		class TestPlayerFactory : public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		const char* url,
		float curScore) {
		if (TestPlayerStub::canBeUsed(url)) {
		return 1.0;
		}

		return 0.0;
		}

		virtual sp<MediaPlayerBase> createPlayer() {
		LOGV("Create Test Player stub");
		return new TestPlayerStub();
		}
		};

		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() {
		LOGV(" 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() {
		LOGV(" 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);

		if (sInitComplete)
		return;

		registerFactory_l(new StagefrightPlayerFactory(), STAGEFRIGHT_PLAYER);
		registerFactory_l(new NuPlayerFactory(), NU_PLAYER);
		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;
		}

		} // namespace android