From 90a202b9b548dd1931a6926dca097eaed3c83ab6 Mon Sep 17 00:00:00 2001 From: Lele Liu Date: Sat, 18 Jun 2022 11:41:35 +0800 Subject: [PATCH] decoder: Revert "decoder: CB2 hdr information is acquired abnormal [1/1] SWPL-83432 BUG=232905331 Problem: regression issue. Solution: revert commit 91811f324c6f8988861246831420e09b763b4d62. Verify: adt3 Change-Id: I7b61fbb463acebde6eee75ae3cf78d511a4e7388 --- drivers/frame_provider/decoder/h264_multi/vmh264.c | 7 +------ drivers/frame_provider/decoder/h265/vh265.c | 7 ------- drivers/frame_provider/decoder/vav1/vav1.c | 7 ------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/frame_provider/decoder/h264_multi/vmh264.c b/drivers/frame_provider/decoder/h264_multi/vmh264.c index 4ffa894..9150d19 100644 --- a/drivers/frame_provider/decoder/h264_multi/vmh264.c +++ b/drivers/frame_provider/decoder/h264_multi/vmh264.c @@ -6547,12 +6547,7 @@ static irqreturn_t vh264_isr_thread_fn(struct vdec_s *vdec, int irq) ((video_signal & 0xff0000) >> 16) | ((video_signal & 0x3f000000)); - /* When the matrix_coeffiecents, transfer_characteristics and colour_primaries - * syntax elements are absent, their values shall be presumed to be equal to 2 - */ - if ((hw->video_signal_from_vui & 0x100000) == 0) { - hw->video_signal_from_vui = (hw->video_signal_from_vui & 0xfff00000) | 0x20202; - } + /*dpb_print(DECODE_ID(hw), 0, "video_signal_from_vui:0x%x, " diff --git a/drivers/frame_provider/decoder/h265/vh265.c b/drivers/frame_provider/decoder/h265/vh265.c index 7ef22cb..9369556 100644 --- a/drivers/frame_provider/decoder/h265/vh265.c +++ b/drivers/frame_provider/decoder/h265/vh265.c @@ -11363,13 +11363,6 @@ force_output: } #endif hevc->video_signal_type = (v << 16) | c; - - /* When the matrix_coeffiecents, transfer_characteristics and colour_primaries - * syntax elements are absent, their values shall be presumed to be equal to 2 - */ - if ((hevc->video_signal_type & 0x100000) == 0) { - hevc->video_signal_type = (hevc->video_signal_type & 0xfff00000) | 0x20202; - } video_signal_type = hevc->video_signal_type; } diff --git a/drivers/frame_provider/decoder/vav1/vav1.c b/drivers/frame_provider/decoder/vav1/vav1.c index b722611..e7ee9f5 100644 --- a/drivers/frame_provider/decoder/vav1/vav1.c +++ b/drivers/frame_provider/decoder/vav1/vav1.c @@ -8533,13 +8533,6 @@ static irqreturn_t vav1_isr_thread_fn(int irq, void *data) hw->video_signal_type = (hw->aom_param.p.video_signal_type << 16 | hw->aom_param.p.color_description); - /* When the matrix_coeffiecents, transfer_characteristics and colour_primaries - * syntax elements are absent, their values shall be presumed to be equal to 2 - */ - if ((hw->video_signal_type & 0x100000) == 0) { - hw->video_signal_type = (hw->video_signal_type & 0xfff00000) | 0x20202; - } - if (next_lcu_size != hw->current_lcu_size) { av1_print(hw, AOM_DEBUG_HW_MORE, " ## lcu_size changed from %d to %d\n", -- 2.20.1