Merge changes from topic 'ims-o' (58207fea) · Commits · e / os / android_frameworks_av

include/ndk/NdkMediaCodec.h

+55 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,61 @@ media_status_t AMediaCodec_setOutputSurface(AMediaCodec, ANativeWindow surface
		media_status_t AMediaCodec_releaseOutputBufferAtTime(
		AMediaCodec *mData, size_t idx, int64_t timestampNs);

		/**
		* Creates a Surface that can be used as the input to encoder, in place of input buffers
		*
		* This can only be called after the codec has been configured via
		* AMediaCodec_configure(..); and before AMediaCodec_start() has been called.
		*
		* The application is responsible for releasing the surface by calling
		* ANativeWindow_release() when done.
		*
		* For more details, see the Java documentation for MediaCodec.createInputSurface.
		*/
		media_status_t AMediaCodec_createInputSurface(
		AMediaCodec mData, ANativeWindow *surface);

		/**
		* Creates a persistent Surface that can be used as the input to encoder
		*
		* Persistent surface can be reused by MediaCodec instances and can be set
		* on a new instance via AMediaCodec_setInputSurface().
		* A persistent surface can be connected to at most one instance of MediaCodec
		* at any point in time.
		*
		* The application is responsible for releasing the surface by calling
		* ANativeWindow_release() when done.
		*
		* For more details, see the Java documentation for MediaCodec.createPersistentInputSurface.
		*/
		media_status_t AMediaCodec_createPersistentInputSurface(
		ANativeWindow **surface);

		/**
		* Set a persistent-surface that can be used as the input to encoder, in place of input buffers
		*
		* The surface provided must be a persistent surface created via
		* AMediaCodec_createPersistentInputSurface()
		* This can only be called after the codec has been configured by calling
		* AMediaCodec_configure(..); and before AMediaCodec_start() has been called.
		*
		* For more details, see the Java documentation for MediaCodec.setInputSurface.
		*/
		media_status_t AMediaCodec_setInputSurface(
		AMediaCodec mData, ANativeWindow surface);

		/**
		* Signal additional parameters to the codec instance.
		*
		* Parameters can be communicated only when the codec is running, i.e
		* after AMediaCodec_start() has been called.
		*
		* NOTE: Some of these parameter changes may silently fail to apply.
		*/
		media_status_t AMediaCodec_setParameters(
		AMediaCodec mData, const AMediaFormat params);


		typedef enum {
		AMEDIACODECRYPTOINFO_MODE_CLEAR = 0,
		AMEDIACODECRYPTOINFO_MODE_AES_CTR = 1,

media/ndk/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ LOCAL_C_INCLUDES := \
		frameworks/base/core/jni \
		frameworks/base/media/jni \
		frameworks/av/include/ndk \
		frameworks/native/include \
		frameworks/native/include/media/openmax \
		system/media/camera/include \
		$(call include-path-for, libhardware)/hardware \

		@@ -61,6 +63,7 @@ LOCAL_SHARED_LIBRARIES := \
		libbinder \
		libgui \
		libui \
		libandroid \

		include $(BUILD_SHARED_LIBRARY)

media/ndk/NdkMediaCodec.cpp

+86 −0

Original line number	Diff line number	Diff line
		@@ -31,9 +31,11 @@
		#include <media/stagefright/foundation/ALooper.h>
		#include <media/stagefright/foundation/AMessage.h>

		#include <media/stagefright/PersistentSurface.h>
		#include <media/stagefright/MediaCodec.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/MediaCodecBuffer.h>
		#include <android/native_window.h>

		using namespace android;

		@@ -54,6 +56,18 @@ enum {
		kWhatStopActivityNotifications,
		};

		struct AMediaCodecPersistentSurface : public Surface {
		sp<PersistentSurface> mPersistentSurface;
		AMediaCodecPersistentSurface(
		const sp<IGraphicBufferProducer>& igbp,
		const sp<PersistentSurface>& ps)
		: Surface(igbp) {
		mPersistentSurface = ps;
		}
		virtual ~AMediaCodecPersistentSurface() {
		//mPersistentSurface ref will be let go off here
		}
		};

		class CodecHandler: public AHandler {
		private:
		@@ -377,6 +391,78 @@ media_status_t AMediaCodec_setOutputSurface(AMediaCodec mData, ANativeWindow w
		return translate_error(mData->mCodec->setSurface(surface));
		}

		EXPORT
		media_status_t AMediaCodec_createInputSurface(AMediaCodec mData, ANativeWindow *surface) {
		if (surface == NULL \|\| mData == NULL) {
		return AMEDIA_ERROR_INVALID_PARAMETER;
		}
		*surface = NULL;

		sp<IGraphicBufferProducer> igbp = NULL;
		status_t err = mData->mCodec->createInputSurface(&igbp);
		if (err != NO_ERROR) {
		return translate_error(err);
		}

		*surface = new Surface(igbp);
		ANativeWindow_acquire(*surface);
		return AMEDIA_OK;
		}

		EXPORT
		media_status_t AMediaCodec_createPersistentInputSurface(ANativeWindow **surface) {
		if (surface == NULL) {
		return AMEDIA_ERROR_INVALID_PARAMETER;
		}
		*surface = NULL;

		sp<PersistentSurface> ps = MediaCodec::CreatePersistentInputSurface();
		if (ps == NULL) {
		return AMEDIA_ERROR_UNKNOWN;
		}

		sp<IGraphicBufferProducer> igbp = ps->getBufferProducer();
		if (igbp == NULL) {
		return AMEDIA_ERROR_UNKNOWN;
		}

		*surface = new AMediaCodecPersistentSurface(igbp, ps);
		ANativeWindow_acquire(*surface);

		return AMEDIA_OK;
		}

		EXPORT
		media_status_t AMediaCodec_setInputSurface(
		AMediaCodec mData, ANativeWindow surface) {

		if (surface == NULL \|\| mData == NULL) {
		return AMEDIA_ERROR_INVALID_PARAMETER;
		}

		AMediaCodecPersistentSurface *aMediaPersistentSurface =
		static_cast<AMediaCodecPersistentSurface *>(surface);
		if (aMediaPersistentSurface->mPersistentSurface == NULL) {
		return AMEDIA_ERROR_INVALID_PARAMETER;
		}

		return translate_error(mData->mCodec->setInputSurface(
		aMediaPersistentSurface->mPersistentSurface));
		}

		EXPORT
		media_status_t AMediaCodec_setParameters(
		AMediaCodec mData, const AMediaFormat params) {
		if (params == NULL \|\| mData == NULL) {
		return AMEDIA_ERROR_INVALID_PARAMETER;
		}
		sp<AMessage> nativeParams;
		AMediaFormat_getFormat(params, &nativeParams);
		ALOGV("setParameters: %s", nativeParams->debugString(0).c_str());

		return translate_error(mData->mCodec->setParameters(nativeParams));
		}

		//EXPORT
		media_status_t AMediaCodec_setNotificationCallback(AMediaCodec *mData, OnCodecEvent callback,
		void *userdata) {