am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with... (1000d426) · Commits · e / os / android_frameworks_av

include/media/stagefright/ACodec.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,6 @@ private:
		unsigned mDequeueCounter;
		bool mStoreMetaDataInOutputBuffers;
		int32_t mMetaDataBuffersToSubmit;
		size_t mNumUndequeuedBuffers;

		int64_t mRepeatFrameDelayUs;
		int64_t mMaxPtsGapUs;

media/libstagefright/ACodec.cpp

+21 −26

Original line number	Diff line number	Diff line
		@@ -640,33 +640,18 @@ status_t ACodec::configureOutputBuffersFromNativeWindow(
		return err;
		}

		// FIXME: assume that surface is controlled by app (native window
		// returns the number for the case when surface is not controlled by app)
		(*minUndequeuedBuffers)++;


		// Use conservative allocation while also trying to reduce starvation
		//
		// 1. allocate at least nBufferCountMin + minUndequeuedBuffers - that is the
		// minimum needed for the consumer to be able to work
		// 2. try to allocate two (2) additional buffers to reduce starvation from
		// the consumer
		for (OMX_U32 extraBuffers = 2; /* condition inside loop */; extraBuffers--) {
		OMX_U32 newBufferCount =
		def.nBufferCountMin + *minUndequeuedBuffers + extraBuffers;
		// XXX: Is this the right logic to use? It's not clear to me what the OMX
		// buffer counts refer to - how do they account for the renderer holding on
		// to buffers?
		if (def.nBufferCountActual < def.nBufferCountMin + *minUndequeuedBuffers) {
		OMX_U32 newBufferCount = def.nBufferCountMin + *minUndequeuedBuffers;
		def.nBufferCountActual = newBufferCount;
		err = mOMX->setParameter(
		mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));

		if (err == OK) {
		*minUndequeuedBuffers += extraBuffers;
		break;
		}

		ALOGW("[%s] setting nBufferCountActual to %lu failed: %d",
		if (err != OK) {
		ALOGE("[%s] setting nBufferCountActual to %lu failed: %d",
		mComponentName.c_str(), newBufferCount, err);
		/* exit condition */
		if (extraBuffers == 0) {
		return err;
		}
		}
		@@ -691,7 +676,6 @@ status_t ACodec::allocateOutputBuffersFromNativeWindow() {
		&bufferCount, &bufferSize, &minUndequeuedBuffers);
		if (err != 0)
		return err;
		mNumUndequeuedBuffers = minUndequeuedBuffers;

		ALOGV("[%s] Allocating %lu buffers from a native window of size %lu on "
		"output port",
		@@ -757,7 +741,6 @@ status_t ACodec::allocateOutputMetaDataBuffers() {
		&bufferCount, &bufferSize, &minUndequeuedBuffers);
		if (err != 0)
		return err;
		mNumUndequeuedBuffers = minUndequeuedBuffers;

		ALOGV("[%s] Allocating %lu meta buffers on output port",
		mComponentName.c_str(), bufferCount);
		@@ -2499,7 +2482,19 @@ void ACodec::waitUntilAllPossibleNativeWindowBuffersAreReturnedToUs() {
		return;
		}

		while (countBuffersOwnedByNativeWindow() > mNumUndequeuedBuffers
		int minUndequeuedBufs = 0;
		status_t err = mNativeWindow->query(
		mNativeWindow.get(), NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,
		&minUndequeuedBufs);

		if (err != OK) {
		ALOGE("[%s] NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS query failed: %s (%d)",
		mComponentName.c_str(), strerror(-err), -err);

		minUndequeuedBufs = 0;
		}

		while (countBuffersOwnedByNativeWindow() > (size_t)minUndequeuedBufs
		&& dequeueBufferFromNativeWindow() != NULL) {
		// these buffers will be submitted as regular buffers; account for this
		if (mStoreMetaDataInOutputBuffers && mMetaDataBuffersToSubmit > 0) {

media/libstagefright/OMXCodec.cpp

+9 −29

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ static sp<MediaSource> InstantiateSoftwareEncoder(

		#define CODEC_LOGI(x, ...) ALOGI("[%s] "x, mComponentName, ##__VA_ARGS__)
		#define CODEC_LOGV(x, ...) ALOGV("[%s] "x, mComponentName, ##__VA_ARGS__)
		#define CODEC_LOGW(x, ...) ALOGW("[%s] "x, mComponentName, ##__VA_ARGS__)
		#define CODEC_LOGE(x, ...) ALOGE("[%s] "x, mComponentName, ##__VA_ARGS__)

		struct OMXCodecObserver : public BnOMXObserver {
		@@ -1795,40 +1794,21 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() {
		strerror(-err), -err);
		return err;
		}
		// FIXME: assume that surface is controlled by app (native window
		// returns the number for the case when surface is not controlled by app)
		minUndequeuedBufs++;

		// Use conservative allocation while also trying to reduce starvation
		//
		// 1. allocate at least nBufferCountMin + minUndequeuedBuffers - that is the
		// minimum needed for the consumer to be able to work
		// 2. try to allocate two (2) additional buffers to reduce starvation from
		// the consumer
		CODEC_LOGI("OMX-buffers: min=%u actual=%u undeq=%d",
		def.nBufferCountMin, def.nBufferCountActual, minUndequeuedBufs);

		for (OMX_U32 extraBuffers = 2; /* condition inside loop */; extraBuffers--) {
		OMX_U32 newBufferCount =
		def.nBufferCountMin + minUndequeuedBufs + extraBuffers;

		// XXX: Is this the right logic to use? It's not clear to me what the OMX
		// buffer counts refer to - how do they account for the renderer holding on
		// to buffers?
		if (def.nBufferCountActual < def.nBufferCountMin + minUndequeuedBufs) {
		OMX_U32 newBufferCount = def.nBufferCountMin + minUndequeuedBufs;
		def.nBufferCountActual = newBufferCount;
		err = mOMX->setParameter(
		mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));

		if (err == OK) {
		minUndequeuedBufs += extraBuffers;
		break;
		}

		CODEC_LOGW("setting nBufferCountActual to %lu failed: %d",
		if (err != OK) {
		CODEC_LOGE("setting nBufferCountActual to %lu failed: %d",
		newBufferCount, err);
		/* exit condition */
		if (extraBuffers == 0) {
		return err;
		}
		}
		CODEC_LOGI("OMX-buffers: min=%u actual=%u undeq=%d",
		def.nBufferCountMin, def.nBufferCountActual, minUndequeuedBufs);

		err = native_window_set_buffer_count(
		mNativeWindow.get(), def.nBufferCountActual);