diff --git a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c index 3620f1a8f1f2..671d45c263ea 100644 --- a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c +++ b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -219,6 +219,7 @@ static u32 ddl_handle_core_recoverable_errors( } break; } + case VIDC_1080P_ERROR_NON_IDR_FRAME_TYPE: case VIDC_1080P_ERROR_BIT_STREAM_BUF_EXHAUST: case VIDC_1080P_ERROR_DESCRIPTOR_TABLE_ENTRY_INVALID: case VIDC_1080P_ERROR_MB_COEFF_NOT_DONE: @@ -243,14 +244,16 @@ static u32 ddl_handle_core_recoverable_errors( case VIDC_1080P_ERROR_SLICE_PARSE_ERROR: case VIDC_1080P_ERROR_NON_PAIRED_FIELD_NOT_SUPPORTED: vcd_status = VCD_ERR_BITSTREAM_ERR; - DDL_MSG_ERROR("VIDC_BIT_STREAM_ERR"); + DDL_MSG_ERROR("VIDC_BIT_STREAM_ERR (%u)", + (u32)ddl_context->cmd_err_status); break; case VIDC_1080P_ERROR_B_FRAME_NOT_SUPPORTED: case VIDC_1080P_ERROR_UNSUPPORTED_FEATURE_IN_PROFILE: case VIDC_1080P_ERROR_RESOLUTION_NOT_SUPPORTED: if (ddl->decoding) { vcd_status = VCD_ERR_BITSTREAM_ERR; - DDL_MSG_ERROR("VIDC_BIT_STREAM_ERR"); + DDL_MSG_ERROR("VIDC_BIT_STREAM_ERR (%u)", + (u32)ddl_context->cmd_err_status); } break; default: diff --git a/drivers/video/msm/vidc/1080p/ddl/vidc.h b/drivers/video/msm/vidc/1080p/ddl/vidc.h index 22fcd1c64ff0..9ac32335279b 100644 --- a/drivers/video/msm/vidc/1080p/ddl/vidc.h +++ b/drivers/video/msm/vidc/1080p/ddl/vidc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -103,6 +103,7 @@ #define VIDC_1080P_ERROR_SPS_PARSE_ERROR 129 #define VIDC_1080P_ERROR_PPS_PARSE_ERROR 130 #define VIDC_1080P_ERROR_SLICE_PARSE_ERROR 131 +#define VIDC_1080P_ERROR_NON_IDR_FRAME_TYPE 132 #define VIDC_1080P_ERROR_SYNC_POINT_NOT_RECEIVED 171 #define VIDC_1080P_WARN_COMMAND_FLUSHED 145