diff --git a/.pick_status.json b/.pick_status.json index d50f47a3828..dab7a7b6bbd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -34,7 +34,7 @@ "description": "anv/video: fix VP9 chroma subsampling format detection", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "314de7af063ff7f40c10df8cd022f35e5eb7fa1a", "notes": null diff --git a/src/intel/vulkan/genX_cmd_video.c b/src/intel/vulkan/genX_cmd_video.c index c536708371a..dd1caa55d08 100644 --- a/src/intel/vulkan/genX_cmd_video.c +++ b/src/intel/vulkan/genX_cmd_video.c @@ -3306,11 +3306,14 @@ anv_vp9_decode_video(struct anv_cmd_buffer *cmd_buffer, pic.Log2TileColumn = std_pic->tile_cols_log2; pic.Log2TileRow = std_pic->tile_rows_log2; - if (std_pic->pColorConfig->subsampling_x == 1 || std_pic->pColorConfig->subsampling_y == 1) { + if (std_pic->pColorConfig->subsampling_x == 1 && + std_pic->pColorConfig->subsampling_y == 1) { pic.ChromaSamplingFormat = Format_420; - } else if (std_pic->pColorConfig->subsampling_x == 1 || std_pic->pColorConfig->subsampling_y == 0) { + } else if (std_pic->pColorConfig->subsampling_x == 1 && + std_pic->pColorConfig->subsampling_y == 0) { pic.ChromaSamplingFormat = Format_422; - } else if (std_pic->pColorConfig->subsampling_x == 0 || std_pic->pColorConfig->subsampling_y == 0) { + } else if (std_pic->pColorConfig->subsampling_x == 0 && + std_pic->pColorConfig->subsampling_y == 0) { pic.ChromaSamplingFormat = Format_444; }