Merge "MediaPlayer2: remove setRetransmitEndpoint" (677fb050) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer2.java

+0 −29

Original line number	Diff line number	Diff line
		@@ -1670,35 +1670,6 @@ public abstract class MediaPlayer2 implements SubtitleController.Listener
		*/
		public abstract void deselectTrack(int index);

		/**
		* Sets the target UDP re-transmit endpoint for the low level player.
		* Generally, the address portion of the endpoint is an IP multicast
		* address, although a unicast address would be equally valid. When a valid
		* retransmit endpoint has been set, the media player will not decode and
		* render the media presentation locally. Instead, the player will attempt
		* to re-multiplex its media data using the Android@Home RTP profile and
		* re-transmit to the target endpoint. Receiver devices (which may be
		* either the same as the transmitting device or different devices) may
		* instantiate, prepare, and start a receiver player using a setDataSource
		* URL of the form...
		*
		* aahRX://<multicastIP>:<port>
		*
		* to receive, decode and render the re-transmitted content.
		*
		* setRetransmitEndpoint may only be called before setDataSource has been
		* called; while the player is in the Idle state.
		*
		* @param endpoint the address and UDP port of the re-transmission target or
		* null if no re-transmission is to be performed.
		* @throws IllegalStateException if it is called in an invalid state
		* @throws IllegalArgumentException if the retransmit endpoint is supplied,
		* but invalid.
		*
		* {@hide} pending API council
		*/
		public void setRetransmitEndpoint(InetSocketAddress endpoint) { }

		/**
		* Releases the resources held by this {@code MediaPlayer2} object.
		*

media/java/android/media/MediaPlayer2Impl.java

+0 −47

Original line number	Diff line number	Diff line
		@@ -2963,53 +2963,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		}
		}

		/**
		* Sets the target UDP re-transmit endpoint for the low level player.
		* Generally, the address portion of the endpoint is an IP multicast
		* address, although a unicast address would be equally valid. When a valid
		* retransmit endpoint has been set, the media player will not decode and
		* render the media presentation locally. Instead, the player will attempt
		* to re-multiplex its media data using the Android@Home RTP profile and
		* re-transmit to the target endpoint. Receiver devices (which may be
		* either the same as the transmitting device or different devices) may
		* instantiate, prepare, and start a receiver player using a setDataSource
		* URL of the form...
		*
		* aahRX://<multicastIP>:<port>
		*
		* to receive, decode and render the re-transmitted content.
		*
		* setRetransmitEndpoint may only be called before setDataSource has been
		* called; while the player is in the Idle state.
		*
		* @param endpoint the address and UDP port of the re-transmission target or
		* null if no re-transmission is to be performed.
		* @throws IllegalStateException if it is called in an invalid state
		* @throws IllegalArgumentException if the retransmit endpoint is supplied,
		* but invalid.
		*
		* {@hide} pending API council
		*/
		@Override
		public void setRetransmitEndpoint(InetSocketAddress endpoint)
		throws IllegalStateException, IllegalArgumentException
		{
		String addrString = null;
		int port = 0;

		if (null != endpoint) {
		addrString = endpoint.getAddress().getHostAddress();
		port = endpoint.getPort();
		}

		int ret = native_setRetransmitEndpoint(addrString, port);
		if (ret != 0) {
		throw new IllegalArgumentException("Illegal re-transmit endpoint; native ret " + ret);
		}
		}

		private native final int native_setRetransmitEndpoint(String addrString, int port);

		/**
		* Releases the resources held by this {@code MediaPlayer2} object.
		*

media/jni/android_media_MediaPlayer2.cpp

+0 −40

Original line number	Diff line number	Diff line
		@@ -1099,45 +1099,6 @@ static void android_media_MediaPlayer2_attachAuxEffect(JNIEnv *env, jobject thi
		process_media_player_call( env, thiz, mp->attachAuxEffect(effectId), NULL, NULL );
		}

		static jint
		android_media_MediaPlayer2_setRetransmitEndpoint(JNIEnv *env, jobject thiz,
		jstring addrString, jint port) {
		sp<MediaPlayer2> mp = getMediaPlayer(env, thiz);
		if (mp == NULL ) {
		jniThrowException(env, "java/lang/IllegalStateException", NULL);
		return INVALID_OPERATION;
		}

		const char *cAddrString = NULL;

		if (NULL != addrString) {
		cAddrString = env->GetStringUTFChars(addrString, NULL);
		if (cAddrString == NULL) { // Out of memory
		return NO_MEMORY;
		}
		}
		ALOGV("setRetransmitEndpoint: %s:%d",
		cAddrString ? cAddrString : "(null)", port);

		status_t ret;
		if (cAddrString && (port > 0xFFFF)) {
		ret = BAD_VALUE;
		} else {
		ret = mp->setRetransmitEndpoint(cAddrString,
		static_cast<uint16_t>(port));
		}

		if (NULL != addrString) {
		env->ReleaseStringUTFChars(addrString, cAddrString);
		}

		if (ret == INVALID_OPERATION ) {
		jniThrowException(env, "java/lang/IllegalStateException", NULL);
		}

		return (jint) ret;
		}

		static void
		android_media_MediaPlayer2_setNextMediaPlayer(JNIEnv *env, jobject thiz, jobject java_player)
		{
		@@ -1418,7 +1379,6 @@ static const JNINativeMethod gMethods[] = {
		{"setAudioSessionId", "(I)V", (void *)android_media_MediaPlayer2_set_audio_session_id},
		{"_setAuxEffectSendLevel", "(F)V", (void *)android_media_MediaPlayer2_setAuxEffectSendLevel},
		{"attachAuxEffect", "(I)V", (void *)android_media_MediaPlayer2_attachAuxEffect},
		{"native_setRetransmitEndpoint", "(Ljava/lang/String;I)I", (void *)android_media_MediaPlayer2_setRetransmitEndpoint},
		{"setNextMediaPlayer", "(Landroid/media/MediaPlayer2;)V", (void *)android_media_MediaPlayer2_setNextMediaPlayer},
		// Modular DRM
		{ "_prepareDrm", "([B[B)V", (void *)android_media_MediaPlayer2_prepareDrm },