Commit ada0deb4 authored Sep 22, 2010 by Andreas Huber Committed by Android Git Automerger Sep 22, 2010

am f5a8f2f4: Merge "Raise the amount of memory set aside for omx buffer...

am f5a8f2f4: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread

Merge commit 'f5a8f2f4' into gingerbread-plus-aosp

* commit 'f5a8f2f4':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.

parents 1a29d836 f5a8f2f4

media/libstagefright/omx/tests/OMXHarness.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -286,7 +286,7 @@ status_t Harness::testStateTransitions(
	return OK;		return OK;
	}		}

	sp<MemoryDealer> dealer = new MemoryDealer(8 * 1024 * 1024, "OMXHarness");		sp<MemoryDealer> dealer = new MemoryDealer(16 * 1024 * 1024, "OMXHarness");
	IOMX::node_id node;		IOMX::node_id node;

	status_t err =		status_t err =