Merge "msm: vidc: Fix unsupported codec error from video driver" (c1b87eda) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/vidc/msm_vdec.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -1211,11 +1211,17 @@ int msm_vdec_s_fmt(struct msm_vidc_inst inst, struct v4l2_format f)
		rc = -EINVAL;
		goto err_invalid_fmt;
		}
		rc = msm_comm_try_state(inst, MSM_VIDC_CORE_INIT_DONE);
		if (rc) {
		dprintk(VIDC_ERR, "Failed to initialize instance\n");
		goto err_invalid_fmt;
		}
		if (!(get_hal_codec_type(fmt->fourcc) &
		inst->core->dec_codec_supported)) {
		dprintk(VIDC_ERR,
		"Codec(0x%x) not supported\n",
		get_hal_codec_type(fmt->fourcc));
		"Codec(0x%x) is not present in the supported codecs list(0x%x)\n",
		get_hal_codec_type(fmt->fourcc),
		inst->core->dec_codec_supported);
		rc = -EINVAL;
		goto err_invalid_fmt;
		}