From: Ayoung Sim Date: Fri, 15 Jun 2018 07:29:30 +0000 (+0900) Subject: [COMMON] media: mfc: DRV4.0: update prefix [INTERLACE] X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=192bd0f6b4189ba2ea24f847fc1425f3fd0e90f8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] media: mfc: DRV4.0: update prefix [INTERLACE] Change-Id: Ia2d39a9e096c92a1e7329476399e50beb52278bc Signed-off-by: Ayoung Sim --- diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c index 4940722fe0c7..fd5844c142ef 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c @@ -96,7 +96,7 @@ static unsigned int mfc_handle_frame_field(struct s5p_mfc_ctx *ctx) field = V4L2_FIELD_NONE; } - mfc_debug(2, "is_interlace : %d interlace_type : %d, is_mbaff: %d, field: 0x%#x\n", + mfc_debug(2, "[INTERLACE] is_interlace: %d (type : %d), is_mbaff: %d, field: 0x%#x\n", is_interlace, interlace_type, is_mbaff, field); return field; @@ -1087,7 +1087,7 @@ static int mfc_handle_seq_dec(struct s5p_mfc_ctx *ctx) is_mbaff = s5p_mfc_is_mbaff_picture(); if (is_interlace || is_mbaff) dec->is_interlaced = 1; - mfc_debug(3, "interlace: %d, mbaff: %d\n", is_interlace, is_mbaff); + mfc_debug(2, "[INTERLACE] interlace: %d, mbaff: %d\n", is_interlace, is_mbaff); } if (IS_H264_DEC(ctx) || IS_H264_MVC_DEC(ctx) || IS_HEVC_DEC(ctx)) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c b/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c index 955a500ed351..01ee26160614 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c @@ -88,7 +88,7 @@ int s5p_mfc_nal_q_check_enable(struct s5p_mfc_dev *dev) return 0; } if (dec->is_interlaced) { - mfc_debug(2, "There is a interlaced stream\n"); + mfc_debug(2, "[INTERLACE] There is a interlaced stream\n"); return 0; } if (dec->detect_black_bar) { @@ -1537,10 +1537,10 @@ void mfc_nal_q_handle_frame(struct s5p_mfc_ctx *ctx, DecoderOutputStr *pOutStr) goto leave_handle_frame; } if (is_interlaced) { - mfc_debug(2, "NAL Q: Progressive -> Interlaced\n"); + mfc_debug(2, "NAL Q:[INTERLACE] Progressive -> Interlaced\n"); dec->is_interlaced = is_interlaced; dev->nal_q_handle->nal_q_exception = 1; - mfc_info_ctx("NAL Q: nal_q_exception is set (interlaced)\n"); + mfc_info_ctx("NAL Q:[INTERLACE] nal_q_exception is set\n"); goto leave_handle_frame; }