diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-03 14:44:13 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-03 14:44:13 +0200 |
| commit | 0132c27dcf559157ae6e86e741cafe9c2a1ffe7e (patch) | |
| tree | 5e39d5bf1eaf8c5a1baf2d285ddfd405838d528f /linux/drivers/media/video/ivtv/ivtv-yuv.c | |
| parent | 40c9c650dd0fdc4c693de14923f974299056b09a (diff) | |
| download | mediapointer-dvb-s2-0132c27dcf559157ae6e86e741cafe9c2a1ffe7e.tar.gz mediapointer-dvb-s2-0132c27dcf559157ae6e86e741cafe9c2a1ffe7e.tar.bz2 | |
ivtv: prevent vertical overflow of yuv output
From: Ian Armstrong <ian@iarmst.demon.co.uk>
When the video standard is changed, there's no guarantee the framebuffer
dimensions are still legal. The yuv output code uses these dimensions to
calculate the size & position for the video overlay. If the framebuffer
dimensions are now illegal, the output may exceed the vertical limit of the
display, causing distortion.
This patch adds an additional check to ensure the output doesn't exceed
the limits for the current video standard, cropping if required.
Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-yuv.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-yuv.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-yuv.c b/linux/drivers/media/video/ivtv/ivtv-yuv.c index bcea09542..70ddf4060 100644 --- a/linux/drivers/media/video/ivtv/ivtv-yuv.c +++ b/linux/drivers/media/video/ivtv/ivtv-yuv.c @@ -898,8 +898,21 @@ static void ivtv_yuv_init (struct ivtv *itv) itv->yuv_info.decode_height = 480; /* If no visible size set, assume full size */ - if (!itv->yuv_info.osd_vis_w) itv->yuv_info.osd_vis_w = 720 - itv->yuv_info.osd_x_offset; - if (!itv->yuv_info.osd_vis_h) itv->yuv_info.osd_vis_h = itv->yuv_info.decode_height - itv->yuv_info.osd_y_offset; + if (!itv->yuv_info.osd_vis_w) + itv->yuv_info.osd_vis_w = 720 - itv->yuv_info.osd_x_offset; + + if (!itv->yuv_info.osd_vis_h) { + itv->yuv_info.osd_vis_h = itv->yuv_info.decode_height - itv->yuv_info.osd_y_offset; + } else { + /* If output video standard has changed, requested height may + not be legal */ + if (itv->yuv_info.osd_vis_h + itv->yuv_info.osd_y_offset > itv->yuv_info.decode_height) { + IVTV_DEBUG_WARN("Clipping yuv output - fb size (%d) exceeds video standard limit (%d)\n", + itv->yuv_info.osd_vis_h + itv->yuv_info.osd_y_offset, + itv->yuv_info.decode_height); + itv->yuv_info.osd_vis_h = itv->yuv_info.decode_height - itv->yuv_info.osd_y_offset; + } + } /* We need a buffer for blanking when Y plane is offset - non-fatal if we can't get one */ itv->yuv_info.blanking_ptr = kzalloc(720*16,GFP_KERNEL); |