Merge "Added Tunneled video playback support to ACodec" into lmp-dev (e079c76c) · Commits · e / os / android_frameworks_av

include/media/IOMX.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,10 @@ public:
		node_id node, OMX_U32 portIndex, OMX_BOOL enable,
		OMX_U32 maxFrameWidth, OMX_U32 maxFrameHeight) = 0;

		virtual status_t configureVideoTunnelMode(
		node_id node, OMX_U32 portIndex, OMX_BOOL tunneled,
		OMX_U32 audioHwSync, native_handle_t **sidebandHandle) = 0;

		virtual status_t enableGraphicBuffers(
		node_id node, OMX_U32 port_index, OMX_BOOL enable) = 0;

include/media/stagefright/ACodec.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -234,6 +234,9 @@ private:
		status_t setComponentRole(bool isEncoder, const char *mime);
		status_t configureCodec(const char *mime, const sp<AMessage> &msg);

		status_t configureTunneledVideoPlayback(int64_t audioHwSync,
		const sp<ANativeWindow> &nativeWindow);

		status_t setVideoPortFormatType(
		OMX_U32 portIndex,
		OMX_VIDEO_CODINGTYPE compressionFormat,

media/libmedia/IOMX.cpp

+38 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ enum {
		GET_GRAPHIC_BUFFER_USAGE,
		SET_INTERNAL_OPTION,
		UPDATE_GRAPHIC_BUFFER_IN_META,
		CONFIGURE_VIDEO_TUNNEL_MODE,
		};

		class BpOMX : public BpInterface<IOMX> {
		@@ -368,6 +369,25 @@ public:
		return err;
		}

		virtual status_t configureVideoTunnelMode(
		node_id node, OMX_U32 portIndex, OMX_BOOL tunneled,
		OMX_U32 audioHwSync, native_handle_t **sidebandHandle ) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		data.writeInt32((int32_t)node);
		data.writeInt32(portIndex);
		data.writeInt32((int32_t)tunneled);
		data.writeInt32(audioHwSync);
		remote()->transact(CONFIGURE_VIDEO_TUNNEL_MODE, data, &reply);

		status_t err = reply.readInt32();
		if (sidebandHandle) {
		sidebandHandle = (native_handle_t )reply.readNativeHandle();
		}
		return err;
		}


		virtual status_t allocateBuffer(
		node_id node, OMX_U32 port_index, size_t size,
		buffer_id buffer, void *buffer_data) {
		@@ -804,6 +824,24 @@ status_t BnOMX::onTransact(
		return NO_ERROR;
		}

		case CONFIGURE_VIDEO_TUNNEL_MODE:
		{
		CHECK_OMX_INTERFACE(IOMX, data, reply);

		node_id node = (node_id)data.readInt32();
		OMX_U32 port_index = data.readInt32();
		OMX_BOOL tunneled = (OMX_BOOL)data.readInt32();
		OMX_U32 audio_hw_sync = data.readInt32();

		native_handle_t *sideband_handle;
		status_t err = configureVideoTunnelMode(
		node, port_index, tunneled, audio_hw_sync, &sideband_handle);
		reply->writeInt32(err);
		reply->writeNativeHandle(sideband_handle);

		return NO_ERROR;
		}

		case ALLOC_BUFFER:
		{
		CHECK_OMX_INTERFACE(IOMX, data, reply);

media/libstagefright/ACodec.cpp

+100 −57

Original line number	Diff line number	Diff line
		@@ -1224,7 +1224,6 @@ status_t ACodec::configureCodec(
		}
		}

		// Always try to enable dynamic output buffers on native surface
		sp<RefBase> obj;
		int32_t haveNativeWindow = msg->findObject("native-window", &obj) &&
		obj != NULL;
		@@ -1233,7 +1232,31 @@ status_t ACodec::configureCodec(
		inputFormat->setInt32("adaptive-playback", false);
		}
		if (!encoder && video && haveNativeWindow) {
		err = mOMX->storeMetaDataInBuffers(mNode, kPortIndexOutput, OMX_TRUE);
		sp<NativeWindowWrapper> windowWrapper(
		static_cast<NativeWindowWrapper *>(obj.get()));
		sp<ANativeWindow> nativeWindow = windowWrapper->getNativeWindow();

		int32_t tunneled;
		if (msg->findInt32("feature-tunneled-playback", &tunneled) &&
		tunneled != 0) {
		ALOGI("Configuring TUNNELED video playback.");

		int64_t audioHwSync = 0;
		if (!msg->findInt64("audio-hw-sync", &audioHwSync)) {
		ALOGW("No Audio HW Sync provided for video tunnel");
		}
		err = configureTunneledVideoPlayback(audioHwSync, nativeWindow);
		if (err != OK) {
		ALOGE("configureTunneledVideoPlayback(%" PRId64 ",%p) failed!",
		audioHwSync, nativeWindow.get());
		return err;
		}

		inputFormat->setInt32("adaptive-playback", true);
		} else {
		// Always try to enable dynamic output buffers on native surface
		err = mOMX->storeMetaDataInBuffers(
		mNode, kPortIndexOutput, OMX_TRUE);
		if (err != OK) {
		ALOGE("[%s] storeMetaDataInBuffers failed w/ err %d",
		mComponentName.c_str(), err);
		@@ -1248,10 +1271,6 @@ status_t ACodec::configureCodec(
		int usageBits = 0;
		bool canDoAdaptivePlayback;

		sp<NativeWindowWrapper> windowWrapper(
		static_cast<NativeWindowWrapper *>(obj.get()));
		sp<ANativeWindow> nativeWindow = windowWrapper->getNativeWindow();

		if (nativeWindow->query(
		nativeWindow.get(),
		NATIVE_WINDOW_CONSUMER_USAGE_BITS,
		@@ -1272,7 +1291,8 @@ status_t ACodec::configureCodec(
		mComponentName.c_str(), maxWidth, maxHeight);

		err = mOMX->prepareForAdaptivePlayback(
		mNode, kPortIndexOutput, OMX_TRUE, maxWidth, maxHeight);
		mNode, kPortIndexOutput, OMX_TRUE, maxWidth,
		maxHeight);
		ALOGW_IF(err != OK,
		"[%s] prepareForAdaptivePlayback failed w/ err %d",
		mComponentName.c_str(), err);
		@@ -1286,7 +1306,8 @@ status_t ACodec::configureCodec(
		// allow failure
		err = OK;
		} else {
		ALOGV("[%s] storeMetaDataInBuffers succeeded", mComponentName.c_str());
		ALOGV("[%s] storeMetaDataInBuffers succeeded",
		mComponentName.c_str());
		mStoreMetaDataInOutputBuffers = true;
		inputFormat->setInt32("adaptive-playback", true);
		}
		@@ -1296,6 +1317,7 @@ status_t ACodec::configureCodec(
		&& push != 0) {
		mFlags \|= kFlagPushBlankBuffersToNativeWindowOnShutdown;
		}
		}

		int32_t rotationDegrees;
		if (msg->findInt32("rotation-degrees", &rotationDegrees)) {
		@@ -1869,6 +1891,27 @@ status_t ACodec::setupRawAudioFormat(
		mNode, OMX_IndexParamAudioPcm, &pcmParams, sizeof(pcmParams));
		}

		status_t ACodec::configureTunneledVideoPlayback(
		int64_t audioHwSync, const sp<ANativeWindow> &nativeWindow) {
		native_handle_t* sidebandHandle;

		status_t err = mOMX->configureVideoTunnelMode(
		mNode, kPortIndexOutput, OMX_TRUE, audioHwSync, &sidebandHandle);
		if (err != OK) {
		ALOGE("configureVideoTunnelMode failed! (err %d).", err);
		return err;
		}

		err = native_window_set_sideband_stream(nativeWindow.get(), sidebandHandle);
		if (err != OK) {
		ALOGE("native_window_set_sideband_stream(%p) failed! (err %d).",
		sidebandHandle, err);
		return err;
		}

		return OK;
		}

		status_t ACodec::setVideoPortFormatType(
		OMX_U32 portIndex,
		OMX_VIDEO_CODINGTYPE compressionFormat,

media/libstagefright/OMXClient.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,10 @@ struct MuxOMX : public IOMX {
		node_id node, OMX_U32 port_index, OMX_BOOL enable,
		OMX_U32 maxFrameWidth, OMX_U32 maxFrameHeight);

		virtual status_t configureVideoTunnelMode(
		node_id node, OMX_U32 portIndex, OMX_BOOL tunneled,
		OMX_U32 audioHwSync, native_handle_t **sidebandHandle);

		virtual status_t enableGraphicBuffers(
		node_id node, OMX_U32 port_index, OMX_BOOL enable);

		@@ -291,6 +295,13 @@ status_t MuxOMX::prepareForAdaptivePlayback(
		node, port_index, enable, maxFrameWidth, maxFrameHeight);
		}

		status_t MuxOMX::configureVideoTunnelMode(
		node_id node, OMX_U32 portIndex, OMX_BOOL enable,
		OMX_U32 audioHwSync, native_handle_t **sidebandHandle) {
		return getOMX(node)->configureVideoTunnelMode(
		node, portIndex, enable, audioHwSync, sidebandHandle);
		}

		status_t MuxOMX::enableGraphicBuffers(
		node_id node, OMX_U32 port_index, OMX_BOOL enable) {
		return getOMX(node)->enableGraphicBuffers(node, port_index, enable);