stagefright: reconnect to ANW on setup in non-output-meta mode (c58f7667) · Commits · e / os / android_frameworks_av

include/media/stagefright/ACodec.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -315,11 +315,12 @@ private:

		status_t handleSetSurface(const sp<Surface> &surface);
		status_t setupNativeWindowSizeFormatAndUsage(
		ANativeWindow nativeWindow / nonnull /, int finalUsage /* nonnull */);
		ANativeWindow nativeWindow / nonnull /, int finalUsage /* nonnull */,
		bool reconnect);

		status_t configureOutputBuffersFromNativeWindow(
		OMX_U32 nBufferCount, OMX_U32 nBufferSize,
		OMX_U32 *nMinUndequeuedBuffers);
		OMX_U32 *nMinUndequeuedBuffers, bool preregister);
		status_t allocateOutputMetadataBuffers();
		status_t submitOutputMetadataBuffer();
		void signalSubmitOutputMetadataBufferIfEOS_workaround();

include/media/stagefright/SurfaceUtils.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -24,9 +24,14 @@ struct ANativeWindow;

		namespace android {

		/**
		* Configures \|nativeWindow\| for given \|width\|x\|height\|, pixel \|format\|, \|rotation\| and \|usage\|.
		* If \|reconnect\| is true, reconnects to the native window before hand.
		* @return first error encountered, or NO_ERROR on success.
		*/
		status_t setNativeWindowSizeFormatAndUsage(
		ANativeWindow nativeWindow / nonnull */,
		int width, int height, int format, int rotation, int usage);
		int width, int height, int format, int rotation, int usage, bool reconnect);
		status_t pushBlankBuffersToNativeWindow(ANativeWindow nativeWindow / nonnull */);

		} // namespace android

media/libstagefright/ACodec.cpp

+15 −7

Original line number	Diff line number	Diff line
		@@ -675,7 +675,10 @@ status_t ACodec::handleSetSurface(const sp<Surface> &surface) {
		}

		int usageBits = 0;
		status_t err = setupNativeWindowSizeFormatAndUsage(nativeWindow, &usageBits);
		// no need to reconnect as we will not dequeue all buffers
		status_t err = setupNativeWindowSizeFormatAndUsage(
		nativeWindow, &usageBits,
		!storingMetadataInDecodedBuffers() \|\| mLegacyAdaptiveExperiment /* reconnect */);
		if (err != OK) {
		return err;
		}
		@@ -949,7 +952,8 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) {
		}

		status_t ACodec::setupNativeWindowSizeFormatAndUsage(
		ANativeWindow nativeWindow / nonnull /, int finalUsage /* nonnull */) {
		ANativeWindow nativeWindow / nonnull /, int finalUsage /* nonnull */,
		bool reconnect) {
		OMX_PARAM_PORTDEFINITIONTYPE def;
		InitOMXParams(&def);
		def.nPortIndex = kPortIndexOutput;
		@@ -987,12 +991,14 @@ status_t ACodec::setupNativeWindowSizeFormatAndUsage(
		def.format.video.nFrameHeight,
		def.format.video.eColorFormat,
		mRotationDegrees,
		usage);
		usage,
		reconnect);
		}

		status_t ACodec::configureOutputBuffersFromNativeWindow(
		OMX_U32 bufferCount, OMX_U32 bufferSize,
		OMX_U32 *minUndequeuedBuffers) {
		OMX_U32 *minUndequeuedBuffers, bool preregister) {

		OMX_PARAM_PORTDEFINITIONTYPE def;
		InitOMXParams(&def);
		def.nPortIndex = kPortIndexOutput;
		@@ -1001,7 +1007,8 @@ status_t ACodec::configureOutputBuffersFromNativeWindow(
		mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));

		if (err == OK) {
		err = setupNativeWindowSizeFormatAndUsage(mNativeWindow.get(), &mNativeWindowUsageBits);
		err = setupNativeWindowSizeFormatAndUsage(
		mNativeWindow.get(), &mNativeWindowUsageBits, preregister /* reconnect */);
		}
		if (err != OK) {
		mNativeWindowUsageBits = 0;
		@@ -1083,7 +1090,7 @@ status_t ACodec::configureOutputBuffersFromNativeWindow(
		status_t ACodec::allocateOutputBuffersFromNativeWindow() {
		OMX_U32 bufferCount, bufferSize, minUndequeuedBuffers;
		status_t err = configureOutputBuffersFromNativeWindow(
		&bufferCount, &bufferSize, &minUndequeuedBuffers);
		&bufferCount, &bufferSize, &minUndequeuedBuffers, true /* preregister */);
		if (err != 0)
		return err;
		mNumUndequeuedBuffers = minUndequeuedBuffers;
		@@ -1169,7 +1176,8 @@ status_t ACodec::allocateOutputBuffersFromNativeWindow() {
		status_t ACodec::allocateOutputMetadataBuffers() {
		OMX_U32 bufferCount, bufferSize, minUndequeuedBuffers;
		status_t err = configureOutputBuffersFromNativeWindow(
		&bufferCount, &bufferSize, &minUndequeuedBuffers);
		&bufferCount, &bufferSize, &minUndequeuedBuffers,
		mLegacyAdaptiveExperiment /* preregister */);
		if (err != 0)
		return err;
		mNumUndequeuedBuffers = minUndequeuedBuffers;

media/libstagefright/MediaCodec.cpp

+11 −8

Original line number	Diff line number	Diff line
		@@ -1791,9 +1791,8 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		err = BAD_VALUE;
		} else {
		err = connectToSurface(surface);
		if (err == BAD_VALUE) {
		// assuming reconnecting to same surface
		// TODO: check if it is the same surface
		if (err == ALREADY_EXISTS) {
		// reconnecting to same surface
		err = OK;
		} else {
		if (err == OK) {
		@@ -2683,11 +2682,14 @@ ssize_t MediaCodec::dequeuePortBuffer(int32_t portIndex) {
		status_t MediaCodec::connectToSurface(const sp<Surface> &surface) {
		status_t err = OK;
		if (surface != NULL) {
		if (mSurface != NULL
		&& surface->getConsumerName() == mSurface->getConsumerName()) {
		ALOGI("connecting to native window with same name. Assuming no change of surface");
		return ALREADY_EXISTS;
		}

		err = native_window_api_connect(surface.get(), NATIVE_WINDOW_API_MEDIA);
		if (err == BAD_VALUE) {
		ALOGI("native window already connected. Assuming no change of surface");
		return err;
		} else if (err == OK) {
		if (err == OK) {
		// Require a fresh set of buffers after each connect by using a unique generation
		// number. Rely on the fact that max supported process id by Linux is 2^22.
		// PID is never 0 so we don't have to worry that we use the default generation of 0.
		@@ -2709,7 +2711,8 @@ status_t MediaCodec::connectToSurface(const sp<Surface> &surface) {
		ALOGE("native_window_api_connect returned an error: %s (%d)", strerror(-err), err);
		}
		}
		return err;
		// do not return ALREADY_EXISTS unless surfaces are the same
		return err == ALREADY_EXISTS ? BAD_VALUE : err;
		}

		status_t MediaCodec::disconnectFromSurface() {

media/libstagefright/SurfaceUtils.cpp

+21 −3

Original line number	Diff line number	Diff line
		@@ -26,8 +26,25 @@ namespace android {

		status_t setNativeWindowSizeFormatAndUsage(
		ANativeWindow nativeWindow / nonnull */,
		int width, int height, int format, int rotation, int usage) {
		status_t err = native_window_set_buffers_dimensions(nativeWindow, width, height);
		int width, int height, int format, int rotation, int usage, bool reconnect) {
		status_t err = NO_ERROR;

		// In some cases we need to reconnect so that we can dequeue all buffers
		if (reconnect) {
		err = native_window_api_disconnect(nativeWindow, NATIVE_WINDOW_API_MEDIA);
		if (err != NO_ERROR) {
		ALOGE("native_window_api_disconnect failed: %s (%d)", strerror(-err), -err);
		return err;
		}

		err = native_window_api_connect(nativeWindow, NATIVE_WINDOW_API_MEDIA);
		if (err != NO_ERROR) {
		ALOGE("native_window_api_connect failed: %s (%d)", strerror(-err), -err);
		return err;
		}
		}

		err = native_window_set_buffers_dimensions(nativeWindow, width, height);
		if (err != NO_ERROR) {
		ALOGE("native_window_set_buffers_dimensions failed: %s (%d)", strerror(-err), -err);
		return err;
		@@ -124,7 +141,8 @@ status_t pushBlankBuffersToNativeWindow(ANativeWindow nativeWindow / nonnull *
		}

		err = setNativeWindowSizeFormatAndUsage(
		nativeWindow, 1, 1, HAL_PIXEL_FORMAT_RGBX_8888, 0, GRALLOC_USAGE_SW_WRITE_OFTEN);
		nativeWindow, 1, 1, HAL_PIXEL_FORMAT_RGBX_8888, 0, GRALLOC_USAGE_SW_WRITE_OFTEN,
		false /* reconnect */);
		if (err != NO_ERROR) {
		goto error;
		}