Merge "MediaCodec: add reset() + documentation fixes" into lmp-dev (e66de8f3) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -14427,6 +14427,7 @@ package android.media {
		method public final void release();
		method public final void releaseOutputBuffer(int, boolean);
		method public final void releaseOutputBuffer(int, long);
		method public final void reset();
		method public void setCallback(android.media.MediaCodec.Callback);
		method public final void setParameters(android.os.Bundle);
		method public final void setVideoScalingMode(int);

media/java/android/media/MediaCodec.java

+36 −12

Original line number	Diff line number	Diff line
		@@ -136,14 +136,17 @@ import java.util.Map;
		* cycle is necessary.
		*
		* <p> During its life, a codec conceptually exists in one of the following states:
		* Initialized, Configured, Executing, Uninitialized, (omitting transitory states
		* Initialized, Configured, Executing, Error, Uninitialized, (omitting transitory states
		* between them). When created by one of the factory methods,
		* the codec is in the Initialized state; {@link #configure} brings it to the
		* Configured state; {@link #start} brings it to the Executing state.
		* In the Executing state, decoding or encoding occurs through the buffer queue
		* manipulation described above. The method {@link #stop}
		* returns the codec to the Initialized state, whereupon it may be configured again,
		* and {@link #release} brings the codec to the terminal Uninitialized state.
		* and {@link #release} brings the codec to the terminal Uninitialized state. When
		* a codec error occurs, the codec moves to the Error state. Use {@link #reset} to
		* bring the codec back to the Initialized state, or {@link #release} to move it
		* to the Uninitialized state.
		*
		* <p> The factory methods
		* {@link #createByCodecName},
		@@ -170,7 +173,8 @@ import java.util.Map;
		* then resources are temporarily unavailable and the method may be retried at a later time.
		* If both {@link MediaCodec.CodecException#isRecoverable}
		* and {@link MediaCodec.CodecException#isTransient} return false,
		* then the {@link MediaCodec.CodecException} is fatal and the codec must be released.
		* then the {@link MediaCodec.CodecException} is fatal and the codec must be
		* {@link #reset reset} or {@link #release released}.
		* Both {@link MediaCodec.CodecException#isRecoverable} and
		* {@link MediaCodec.CodecException#isTransient} do not return true at the same time.
		*/
		@@ -428,6 +432,23 @@ final public class MediaCodec {
		native_finalize();
		}

		/**
		* Returns the codec to its initial (Initialized) state.
		*
		* Call this if an {@link MediaCodec.CodecException#isRecoverable unrecoverable}
		* error has occured to reset the codec to its initial state after creation.
		*
		* @throws CodecException if an unrecoverable error has occured and the codec
		* could not be reset.
		* @throws IllegalStateException if in the Uninitialized state.
		*/
		public final void reset() {
		freeAllTrackedBuffers(); // free buffers first
		native_reset();
		}

		private native final void native_reset();

		/**
		* Make sure you call this when you're done to free up any opened
		* component instance instead of relying on the garbage collector
		@@ -646,9 +667,10 @@ final public class MediaCodec {
		/**
		* After filling a range of the input buffer at the specified index
		* submit it to the component. Once an input buffer is queued to
		* the codec, it MUST not be used until it is later retrieved by
		* {#getInputBuffer} in response to a {#dequeueInputBuffer}
		* response.
		* the codec, it MUST NOT be used until it is later retrieved by
		* {@link #getInputBuffer} in response to a {@link #dequeueInputBuffer}
		* return value or a {@link Callback#onInputBufferAvailable}
		* callback.
		* <p>
		* Many decoders require the actual compressed data stream to be
		* preceded by "codec specific data", i.e. setup data used to initialize
		@@ -905,9 +927,10 @@ final public class MediaCodec {
		* the codec. If you previously specified a surface when configuring this
		* video decoder you can optionally render the buffer.
		*
		* Once an output buffer is released to the codec, it MUST not
		* be used until it is later retrieved by {#getOutputBuffer} in
		* response to a {#dequeueOutputBuffer} response
		* Once an output buffer is released to the codec, it MUST NOT
		* be used until it is later retrieved by {@link #getOutputBuffer} in response
		* to a {@link #dequeueOutputBuffer} return value or a
		* {@link Callback#onOutputBufferAvailable} callback.
		*
		* @param index The index of a client-owned output buffer previously returned
		* from a call to {@link #dequeueOutputBuffer}.
		@@ -961,9 +984,10 @@ final public class MediaCodec {
		* </td></tr>
		* </table>
		*
		* Once an output buffer is released to the codec, it MUST not
		* be used until it is later retrieved by {#getOutputBuffer} in
		* response to a {#dequeueOutputBuffer} response
		* Once an output buffer is released to the codec, it MUST NOT
		* be used until it is later retrieved by {@link #getOutputBuffer} in response
		* to a {@link #dequeueOutputBuffer} return value or a
		* {@link Callback#onOutputBufferAvailable} callback.
		*
		* @param index The index of a client-owned output buffer previously returned
		* from a call to {@link #dequeueOutputBuffer}.

media/jni/android_media_MediaCodec.cpp

+26 −0

Original line number	Diff line number	Diff line
		@@ -197,6 +197,10 @@ status_t JMediaCodec::flush() {
		return mCodec->flush();
		}

		status_t JMediaCodec::reset() {
		return mCodec->reset();
		}

		status_t JMediaCodec::queueInputBuffer(
		size_t index,
		size_t offset, size_t size, int64_t timeUs, uint32_t flags,
		@@ -854,6 +858,26 @@ static void android_media_MediaCodec_stop(JNIEnv *env, jobject thiz) {
		throwExceptionAsNecessary(env, err);
		}

		static void android_media_MediaCodec_reset(JNIEnv *env, jobject thiz) {
		ALOGV("android_media_MediaCodec_reset");

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

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

		status_t err = codec->reset();
		if (err != OK) {
		// treat all errors as fatal for now, though resource not available
		// errors could be treated as transient.
		err = 0x80000000;
		}
		throwExceptionAsNecessary(env, err);
		}

		static void android_media_MediaCodec_flush(JNIEnv *env, jobject thiz) {
		ALOGV("android_media_MediaCodec_flush");

		@@ -1398,6 +1422,8 @@ static void android_media_MediaCodec_native_finalize(
		static JNINativeMethod gMethods[] = {
		{ "native_release", "()V", (void *)android_media_MediaCodec_release },

		{ "native_reset", "()V", (void *)android_media_MediaCodec_reset },

		{ "native_setCallback",
		"(Landroid/media/MediaCodec$Callback;)V",
		(void *)android_media_MediaCodec_native_setCallback },

media/jni/android_media_MediaCodec.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ struct JMediaCodec : public AHandler {

		status_t start();
		status_t stop();
		status_t reset();

		status_t flush();