Merge "SoftVpxDec/SoftDav1dDec: Set KEY_PICTURE_SIZE to 4096x4096" into main (a8d54f56) · Commits · e / os / android_frameworks_av

media/codec2/components/dav1d/C2SoftDav1dDec.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -139,8 +139,8 @@ class C2SoftDav1dDec::IntfImpl : public SimpleInterface<void>::BaseParams {
		addParameter(DefineParam(mMaxSize, C2_PARAMKEY_MAX_PICTURE_SIZE)
		.withDefault(new C2StreamMaxPictureSizeTuning::output(0u, 320, 240))
		.withFields({
		C2F(mSize, width).inRange(2, 2048, 2),
		C2F(mSize, height).inRange(2, 2048, 2),
		C2F(mSize, width).inRange(2, 4096, 2),
		C2F(mSize, height).inRange(2, 4096, 2),
		})
		.withSetter(MaxPictureSizeSetter, mSize)
		.build());

+4 −4

Original line number	Diff line number	Diff line
		@@ -69,8 +69,8 @@ public:
		DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE)
		.withDefault(new C2StreamPictureSizeInfo::output(0u, 320, 240))
		.withFields({
		C2F(mSize, width).inRange(2, 2048),
		C2F(mSize, height).inRange(2, 2048),
		C2F(mSize, width).inRange(2, 4096),
		C2F(mSize, height).inRange(2, 4096),
		})
		.withSetter(SizeSetter)
		.build());
		@@ -167,8 +167,8 @@ public:
		DefineParam(mMaxSize, C2_PARAMKEY_MAX_PICTURE_SIZE)
		.withDefault(new C2StreamMaxPictureSizeTuning::output(0u, 320, 240))
		.withFields({
		C2F(mSize, width).inRange(2, 2048, 2),
		C2F(mSize, height).inRange(2, 2048, 2),
		C2F(mSize, width).inRange(2, 4096, 2),
		C2F(mSize, height).inRange(2, 4096, 2),
		})
		.withSetter(MaxPictureSizeSetter, mSize)
		.build());