Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af3aead1 authored Apr 30, 2020 by Jason Macnak

Remove invalid check in avc and hevc dec

If outBuffer is specificed, displayStride is the stride of the
outBuffer (line 526 for avc and line 521 for hevc). Then, the
"Output buffer too small" check ends up comparing a buffer's width
to the buffer's own stride which effectively requires that a
buffer's width is equal to it's stride.

For android.media.cts.DecoderTest#testCodecBasicHEVC, the test
has an outBuffer with width 720 and stride 768 which fails the
check.

Bug: b/146515640
Test: cts -t android.media.cts.DecoderTest
Change-Id: I732f77445cad5390895c8e43f46d11c423c9b2e4

parent 686dac0c

media/codec2/components/avc/C2SoftAvcDec.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -549,7 +549,7 @@ bool C2SoftAvcDec::setDecodeArgs(ivd_video_decode_ip_t *ps_decode_ip,
		ps_decode_ip->s_out_buffer.u4_min_out_buf_size[1] = chromaSize;
		ps_decode_ip->s_out_buffer.u4_min_out_buf_size[2] = chromaSize;
		if (outBuffer) {
		if (outBuffer->width() < displayStride \|\| outBuffer->height() < displayHeight) {
		if (outBuffer->height() < displayHeight) {
		ALOGE("Output buffer too small: provided (%dx%d) required (%ux%u)",
		outBuffer->width(), outBuffer->height(), displayStride, displayHeight);
		return false;

media/codec2/components/hevc/C2SoftHevcDec.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -544,7 +544,7 @@ bool C2SoftHevcDec::setDecodeArgs(ivd_video_decode_ip_t *ps_decode_ip,
		ps_decode_ip->s_out_buffer.u4_min_out_buf_size[1] = chromaSize;
		ps_decode_ip->s_out_buffer.u4_min_out_buf_size[2] = chromaSize;
		if (outBuffer) {
		if (outBuffer->width() < displayStride \|\| outBuffer->height() < displayHeight) {
		if (outBuffer->height() < displayHeight) {
		ALOGE("Output buffer too small: provided (%dx%d) required (%ux%u)",
		outBuffer->width(), outBuffer->height(), displayStride, displayHeight);
		return false;