Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64953c80 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Populate slice size capabilities" into msm-4.9

parents 03ffcdda 0425f245

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

+6 −0
Original line number Diff line number Diff line
@@ -171,6 +171,12 @@ int msm_vidc_query_ctrl(void *instance, struct v4l2_queryctrl *ctrl) 
	case V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES:

		msm_vidc_ctrl_get_range(ctrl, &inst->capability.bframe);

		break;

	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:

		msm_vidc_ctrl_get_range(ctrl, &inst->capability.slice_mbs);

		break;

	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:

		msm_vidc_ctrl_get_range(ctrl, &inst->capability.slice_bytes);

		break;

	default:

		rc = -EINVAL;

	}