Merge "Expose MediaCodec.setParameters API to" into klp-dev (ca2fb915) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -12071,6 +12071,7 @@ package android.media {
		method public final void queueSecureInputBuffer(int, int, android.media.MediaCodec.CryptoInfo, long, int) throws android.media.MediaCodec.CryptoException;
		method public final void release();
		method public final void releaseOutputBuffer(int, boolean);
		method public final void setParameters(java.util.Map<java.lang.String, java.lang.Object>);
		method public final void setVideoScalingMode(int);
		method public final void signalEndOfInputStream();
		method public final void start();
		@@ -12084,6 +12085,9 @@ package android.media {
		field public static final int INFO_OUTPUT_BUFFERS_CHANGED = -3; // 0xfffffffd
		field public static final int INFO_OUTPUT_FORMAT_CHANGED = -2; // 0xfffffffe
		field public static final int INFO_TRY_AGAIN_LATER = -1; // 0xffffffff
		field public static final java.lang.String PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync";
		field public static final java.lang.String PARAMETER_KEY_SUSPEND = "drop-input-frames";
		field public static final java.lang.String PARAMETER_KEY_VIDEO_BITRATE = "videoBitrate";
		field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1
		field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2
		}

media/java/android/media/MediaCodec.java

+46 −0

Original line number	Diff line number	Diff line
		@@ -563,6 +563,52 @@ final public class MediaCodec {
		*/
		public native final String getName();

		/**
		* Change a video encoder's target bitrate on the fly. The value is an
		* Integer object containing the new bitrate in bps.
		*/
		public static final String PARAMETER_KEY_VIDEO_BITRATE = "videoBitrate";

		/**
		* Temporarily suspend/resume encoding of input data. While suspended
		* input data is effectively discarded instead of being fed into the
		* encoder. This parameter really only makes sense to use with an encoder
		* in "surface-input" mode, as the client code has no control over the
		* input-side of the encoder in that case.
		* The value is an Integer object containing the value 1 to suspend
		* or the value 0 to resume.
		*/
		public static final String PARAMETER_KEY_SUSPEND = "drop-input-frames";

		/**
		* Request that the encoder produce a sync frame "soon".
		* Provide an Integer with the value 0.
		*/
		public static final String PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync";

		/**
		* Communicate additional parameter changes to the component instance.
		*/
		public final void setParameters(Map<String, Object> params) {
		if (params == null) {
		return;
		}

		String[] keys = new String[params.size()];
		Object[] values = new Object[params.size()];

		int i = 0;
		for (Map.Entry<String, Object> entry: params.entrySet()) {
		keys[i] = entry.getKey();
		values[i] = entry.getValue();
		++i;
		}

		setParameters(keys, values);
		}

		private native final void setParameters(String[] keys, Object[] values);

		/**
		* Get the codec info. If the codec was created by createDecoderByType
		* or createEncoderByType, what component is chosen is not known beforehand,

media/jni/android_media_MediaCodec.cpp

+28 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,10 @@ status_t JMediaCodec::getName(JNIEnv env, jstring nameStr) const {
		return OK;
		}

		status_t JMediaCodec::setParameters(const sp<AMessage> &msg) {
		return mCodec->setParameters(msg);
		}

		void JMediaCodec::setVideoScalingMode(int mode) {
		if (mSurfaceTextureClient != NULL) {
		native_window_set_scaling_mode(mSurfaceTextureClient.get(), mode);
		@@ -837,6 +841,27 @@ static jobject android_media_MediaCodec_getName(
		return NULL;
		}

		static void android_media_MediaCodec_setParameters(
		JNIEnv *env, jobject thiz, jobjectArray keys, jobjectArray vals) {
		ALOGV("android_media_MediaCodec_setParameters");

		sp<JMediaCodec> codec = getMediaCodec(env, thiz);

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

		sp<AMessage> params;
		status_t err = ConvertKeyValueArraysToMessage(env, keys, vals, &params);

		if (err == OK) {
		err = codec->setParameters(params);
		}

		throwExceptionAsNecessary(env, err);
		}

		static void android_media_MediaCodec_setVideoScalingMode(
		JNIEnv *env, jobject thiz, jint mode) {
		sp<JMediaCodec> codec = getMediaCodec(env, thiz);
		@@ -986,6 +1011,9 @@ static JNINativeMethod gMethods[] = {
		{ "getName", "()Ljava/lang/String;",
		(void *)android_media_MediaCodec_getName },

		{ "setParameters", "([Ljava/lang/String;[Ljava/lang/Object;)V",
		(void *)android_media_MediaCodec_setParameters },

		{ "setVideoScalingMode", "(I)V",
		(void *)android_media_MediaCodec_setVideoScalingMode },

media/jni/android_media_MediaCodec.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,8 @@ struct JMediaCodec : public RefBase {

		status_t getName(JNIEnv env, jstring name) const;

		status_t setParameters(const sp<AMessage> &params);

		void setVideoScalingMode(int mode);

		protected: