summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaheshwar Ajja <majja@codeaurora.org>2014-07-09 16:23:32 +0530
committerBalamurugan Alagarsamy <balaga@codeaurora.org>2014-11-11 13:44:25 +0530
commit4a2a359ece0e7695a4103f87ec55a03d6393ed83 (patch)
tree2356b3dd1ce48546413c41d656d34a5f92abf1fd
parent59fe29a8138d416f1d9b3a6a050e04de933858dd (diff)
downloadandroid_hardware_qcom_media-4a2a359ece0e7695a4103f87ec55a03d6393ed83.tar.gz
android_hardware_qcom_media-4a2a359ece0e7695a4103f87ec55a03d6393ed83.tar.bz2
android_hardware_qcom_media-4a2a359ece0e7695a4103f87ec55a03d6393ed83.zip
Revert "mm-video-v4l2: Update video resolution when updating crop"
This reverts commit 1fb9417d029fe2bd1478ffcf8dde4f2355b2aaf8. Reverting the change because video resolution is not expected to be updated based on the crop parameters from video driver. Alternatively change-id I22ddc9961a271eea379a08534c769f2842142d8f will resolve the failure. Change-Id: I3954cadec21eb6c8da40c792d87995f817be1efb
-rw-r--r--mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
index 7c817eb3..7aaba9e3 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -7011,19 +7011,6 @@ int omx_vdec::async_message_process (void *context, void* message)
omx->drv_ctx.video_resolution.frame_height = vdec_msg->msgdata.output_frame.framesize.bottom;
omx->drv_ctx.video_resolution.frame_width = vdec_msg->msgdata.output_frame.framesize.right;
format_notably_changed = 1;
-
- struct v4l2_format fmt;
- fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
- fmt.fmt.pix_mp.pixelformat = omx->capture_capability;
- fmt.fmt.pix_mp.height = omx->drv_ctx.video_resolution.frame_height;
- fmt.fmt.pix_mp.width = omx->drv_ctx.video_resolution.frame_width;
-
- if (!ioctl(omx->drv_ctx.video_driver_fd, VIDIOC_G_FMT, &fmt)) {
- omx->update_resolution(fmt.fmt.pix_mp.width,
- fmt.fmt.pix_mp.height,
- fmt.fmt.pix_mp.plane_fmt[0].bytesperline,
- fmt.fmt.pix_mp.plane_fmt[0].reserved[0]);
- }
}
}
if (omxhdr->nFilledLen && (((unsigned)omx->rectangle.nLeft !=