From ceab7d9dab8b858b18b1bed48dd2c4f9e87f4323 Mon Sep 17 00:00:00 2001 From: Akshata Sahukar Date: Tue, 6 Apr 2021 11:23:01 -0700 Subject: [PATCH] video: driver: Do not combine PREPEND_SPSPPS_TO_IDR with SEPARATE/JOINED_WITH_1ST_FRAME Combination of PREPEND_SPSPPS_TO_IDR with V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE or V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME is not supported. Hence, prioritize PREPEND_SPSPPS_TO_IDR over SEPARATE/JOINED_WITH_1ST_FRAME to set to fw. Change-Id: Ia23569c046c95889d5eabbe2142d6fd2c69d032a Signed-off-by: Akshata Sahukar --- driver/vidc/src/msm_vidc_control.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/driver/vidc/src/msm_vidc_control.c b/driver/vidc/src/msm_vidc_control.c index 0ec744ddc3..5084cc493e 100644 --- a/driver/vidc/src/msm_vidc_control.c +++ b/driver/vidc/src/msm_vidc_control.c @@ -1578,13 +1578,13 @@ int msm_vidc_set_header_mode(void *instance, prepend_sps_pps = capability->cap[PREPEND_SPSPPS_TO_IDR].value; hdr_metadata = capability->cap[META_SEQ_HDR_NAL].value; - if (header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) - hfi_value |= HFI_SEQ_HEADER_SEPERATE_FRAME; - else if (header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME) - hfi_value |= HFI_SEQ_HEADER_JOINED_WITH_1ST_FRAME; - + /* prioritize PREPEND_SPSPPS_TO_IDR mode over other header modes */ if (prepend_sps_pps) - hfi_value |= HFI_SEQ_HEADER_PREFIX_WITH_SYNC_FRAME; + hfi_value = HFI_SEQ_HEADER_PREFIX_WITH_SYNC_FRAME; + else if (header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME) + hfi_value = HFI_SEQ_HEADER_JOINED_WITH_1ST_FRAME; + else + hfi_value = HFI_SEQ_HEADER_SEPERATE_FRAME; if (hdr_metadata) hfi_value |= HFI_SEQ_HEADER_METADATA;