commit 582c2c6a783f9c6528ed14324057638248033be2
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 22 15:06:16 2022 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Wed Jun 22 15:06:16 2022 +0000
tree f9534c1ba6bc462dd2c4c01bd6e43b3e87261c62
parent d1c499be9ee172629ec36a465310f52b5c4fff24
parent 4641812202e6706442be9a50d343685e305d1214

Merge "h265: CB2 change 265 HDR signal type. [1/1]" into android-tv-deadpool-4.9-android12

drivers/frame_provider/decoder/h265/vh265.c

diff --git a/drivers/frame_provider/decoder/h265/vh265.c b/drivers/frame_provider/decoder/h265/vh265.c
index 9369556..516d74a 100644
--- a/drivers/frame_provider/decoder/h265/vh265.c
+++ b/drivers/frame_provider/decoder/h265/vh265.c
@@ -8513,6 +8513,13 @@
 	}
 	if (hevc->video_signal_type & VIDEO_SIGNAL_TYPE_AVAILABLE_MASK) {
 		vf->signal_type = pic->video_signal_type;
+		/* When the matrix_coeffiecents, transfer_characteristics and colour_primaries
+		 * syntax elements are absent, their values shall be presumed to be equal to 2
+		 */
+		if ((vf->signal_type & 0x1000000) == 0) {
+			vf->signal_type = vf->signal_type & 0xff000000;
+			vf->signal_type = vf->signal_type | 0x20202;
+		}
 		if (hevc->sei_present_flag & SEI_HDR10PLUS_MASK) {
 			u32 data;
 			data = vf->signal_type;