Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947" (d2b0088d) · Commits · e / os / android_frameworks_av

include/media/IMediaPlayer.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@ public:
		virtual status_t setVolume(float leftVolume, float rightVolume) = 0;
		virtual status_t setAuxEffectSendLevel(float level) = 0;
		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;

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

include/media/MediaPlayerInterface.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,8 @@ public:
		virtual status_t reset() = 0;
		virtual status_t setLooping(int loop) = 0;
		virtual player_type playerType() = 0;
		virtual status_t setParameter(int key, const Parcel &request) = 0;
		virtual status_t getParameter(int key, Parcel *reply) = 0;

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

include/media/mediaplayer.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,9 @@ public:
		int getAudioSessionId();
		status_t setAuxEffectSendLevel(float level);
		status_t attachAuxEffect(int effectId);
		status_t setParameter(int key, const Parcel& request);
		status_t getParameter(int key, Parcel* reply);

		private:
		void clear_l();
		status_t seekTo_l(int msec);

media/libmedia/IMediaPlayer.cpp

+39 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ enum {
		SET_AUX_EFFECT_SEND_LEVEL,
		ATTACH_AUX_EFFECT,
		SET_VIDEO_SURFACETEXTURE,
		SET_PARAMETER,
		GET_PARAMETER,
		};

		class BpMediaPlayer: public BpInterface<IMediaPlayer>
		@@ -236,6 +238,26 @@ public:
		return reply.readInt32();
		}

		status_t setParameter(int key, const Parcel& request)
		{
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
		data.writeInt32(key);
		if (request.dataSize() > 0) {
		data.appendFrom(const_cast<Parcel *>(&request), 0, request.dataSize());
		}
		remote()->transact(SET_PARAMETER, data, &reply);
		return reply.readInt32();
		}

		status_t getParameter(int key, Parcel *reply)
		{
		Parcel data;
		data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
		data.writeInt32(key);
		return remote()->transact(GET_PARAMETER, data, reply);
		}

		};

		IMPLEMENT_META_INTERFACE(MediaPlayer, "android.media.IMediaPlayer");
		@@ -361,6 +383,23 @@ status_t BnMediaPlayer::onTransact(
		reply->writeInt32(attachAuxEffect(data.readInt32()));
		return NO_ERROR;
		} break;
		case SET_PARAMETER: {
		CHECK_INTERFACE(IMediaPlayer, data, reply);
		int key = data.readInt32();

		Parcel request;
		if (data.dataAvail() > 0) {
		request.appendFrom(
		const_cast<Parcel *>(&data), data.dataPosition(), data.dataAvail());
		}
		request.setDataPosition(0);
		reply->writeInt32(setParameter(key, request));
		return NO_ERROR;
		} break;
		case GET_PARAMETER: {
		CHECK_INTERFACE(IMediaPlayer, data, reply);
		return getParameter(data.readInt32(), reply);
		} break;
		default:
		return BBinder::onTransact(code, data, reply, flags);
		}

media/libmedia/mediaplayer.cpp

+22 −0

Original line number	Diff line number	Diff line
		@@ -553,6 +553,28 @@ status_t MediaPlayer::attachAuxEffect(int effectId)
		return mPlayer->attachAuxEffect(effectId);
		}

		status_t MediaPlayer::setParameter(int key, const Parcel& request)
		{
		LOGV("MediaPlayer::setParameter(%d)", key);
		Mutex::Autolock _l(mLock);
		if (mPlayer != NULL) {
		return mPlayer->setParameter(key, request);
		}
		LOGV("setParameter: no active player");
		return INVALID_OPERATION;
		}

		status_t MediaPlayer::getParameter(int key, Parcel *reply)
		{
		LOGV("MediaPlayer::getParameter(%d)", key);
		Mutex::Autolock _l(mLock);
		if (mPlayer != NULL) {
		return mPlayer->getParameter(key, reply);
		}
		LOGV("getParameter: no active player");
		return INVALID_OPERATION;
		}

		void MediaPlayer::notify(int msg, int ext1, int ext2, const Parcel *obj)
		{
		LOGV("message received msg=%d, ext1=%d, ext2=%d", msg, ext1, ext2);