media/playerservice: add getCodecList() to MediaPlayerService (1381d4b5) · Commits · e / os / android_frameworks_av

include/media/IMediaPlayerService.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ namespace android {
		struct ICrypto;
		struct IDrm;
		struct IHDCP;
		struct IMediaCodecList;
		struct IMediaHTTPService;
		class IMediaRecorder;
		class IOMX;
		@@ -65,6 +66,7 @@ public:
		virtual sp<ICrypto> makeCrypto() = 0;
		virtual sp<IDrm> makeDrm() = 0;
		virtual sp<IHDCP> makeHDCP(bool createEncryptionModule) = 0;
		virtual sp<IMediaCodecList> getCodecList() const = 0;

		// Connects to a remote display.
		// 'iface' specifies the address of the local interface on which to listen for

+15 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <media/ICrypto.h>
		#include <media/IDrm.h>
		#include <media/IHDCP.h>
		#include <media/IMediaCodecList.h>
		#include <media/IMediaHTTPService.h>
		#include <media/IMediaPlayerService.h>
		#include <media/IMediaRecorder.h>
		@@ -49,6 +50,7 @@ enum {
		ADD_BATTERY_DATA,
		PULL_BATTERY_DATA,
		LISTEN_FOR_REMOTE_DISPLAY,
		GET_CODEC_LIST,
		};

		class BpMediaPlayerService: public BpInterface<IMediaPlayerService>
		@@ -191,6 +193,13 @@ public:
		remote()->transact(LISTEN_FOR_REMOTE_DISPLAY, data, &reply);
		return interface_cast<IRemoteDisplay>(reply.readStrongBinder());
		}

		virtual sp<IMediaCodecList> getCodecList() const {
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
		remote()->transact(GET_CODEC_LIST, data, &reply);
		return interface_cast<IMediaCodecList>(reply.readStrongBinder());
		}
		};

		IMPLEMENT_META_INTERFACE(MediaPlayerService, "android.media.IMediaPlayerService");
		@@ -318,6 +327,12 @@ status_t BnMediaPlayerService::onTransact(
		reply->writeStrongBinder(display->asBinder());
		return NO_ERROR;
		} break;
		case GET_CODEC_LIST: {
		CHECK_INTERFACE(IMediaPlayerService, data, reply);
		sp<IMediaCodecList> mcl = getCodecList();
		reply->writeStrongBinder(mcl->asBinder());
		return NO_ERROR;
		} break;
		default:
		return BBinder::onTransact(code, data, reply, flags);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@
		#include <media/Metadata.h>
		#include <media/AudioTrack.h>
		#include <media/MemoryLeakTrackUtil.h>
		#include <media/stagefright/MediaCodecList.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/stagefright/AudioPlayer.h>
		#include <media/stagefright/foundation/ADebug.h>
		@@ -345,6 +346,10 @@ sp<IMediaPlayer> MediaPlayerService::create(const sp<IMediaPlayerClient>& client
		return c;
		}

		sp<IMediaCodecList> MediaPlayerService::getCodecList() const {
		return MediaCodecList::getLocalInstance();
		}

		sp<IOMX> MediaPlayerService::getOMX() {
		Mutex::Autolock autoLock(mLock);

+1 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,7 @@ public:
		uint32_t pSampleRate, int pNumChannels,
		audio_format_t* pFormat,
		const sp<IMemoryHeap>& heap, size_t *pSize);
		virtual sp<IMediaCodecList> getCodecList() const;
		virtual sp<IOMX> getOMX();
		virtual sp<ICrypto> makeCrypto();
		virtual sp<IDrm> makeDrm();

+16 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,22 @@ sp<IMediaCodecList> MediaCodecList::sRemoteList;

		// static
		sp<IMediaCodecList> MediaCodecList::getInstance() {
		return getLocalInstance();
		Mutex::Autolock _l(sRemoteInitMutex);
		if (sRemoteList == NULL) {
		sp<IBinder> binder =
		defaultServiceManager()->getService(String16("media.player"));
		sp<IMediaPlayerService> service =
		interface_cast<IMediaPlayerService>(binder);
		if (service.get() != NULL) {
		sRemoteList = service->getCodecList();
		}

		if (sRemoteList == NULL) {
		// if failed to get remote list, create local list
		sRemoteList = getLocalInstance();
		}
		}
		return sRemoteList;
		}

		MediaCodecList::MediaCodecList()