V4L/DVB (7243): ivtv: yuv framebuffer tracking

The existing yuv code limits output to the display area occupied by the
framebuffer. This patch allows the yuv output to be 'detached' via
V4L2_FBUF_FLAG_OVERLAY.

By default, the yuv output window will be restricted to the framebuffer
dimensions and the output position is relative to the top left corner of the
framebuffer. This matches the behaviour of previous versions.

If V4L2_FBUF_FLAG_OVERLAY is cleared, the yuv output will no longer be linked
to the framebuffer. The maximum dimensions are either 720x576 or 720x480
depending on the current broadcast standard, with the output position
relative to the top left corner of the display. The framebuffer itself can be
resized, moved and panned without affecting the yuv output.

Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 17 insertions, 8 deletions

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index edef2a579617..f562cbbadc16 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -712,6 +712,7 @@ static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg)
 int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void *arg)
 {
         struct ivtv_open_id *id = NULL;
+        struct yuv_playback_info *yi = &itv->yuv_info;
         u32 data[CX2341X_MBOX_MAX_DATA];
         int streamtype = 0;
 
@@ -837,8 +838,14 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                         cropcap->pixelaspect.numerator = itv->is_50hz ? 59 : 10;
                         cropcap->pixelaspect.denominator = itv->is_50hz ? 54 : 11;
                 } else if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
-                        cropcap->bounds.width = itv->yuv_info.osd_full_w;
-                        cropcap->bounds.height = itv->yuv_info.osd_full_h;
+                        if (yi->track_osd) {
+                                cropcap->bounds.width = yi->osd_full_w;
+                                cropcap->bounds.height = yi->osd_full_h;
+                        } else {
+                                cropcap->bounds.width = 720;
+                                cropcap->bounds.height =
+                                                itv->is_out_50hz ? 576 : 480;
+                        }
                         cropcap->pixelaspect.numerator = itv->is_out_50hz ? 59 : 10;
                         cropcap->pixelaspect.denominator = itv->is_out_50hz ? 54 : 11;
                 } else {
@@ -856,7 +863,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                 if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
                     (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
                         if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
-                                itv->yuv_info.main_rect = crop->c;
+                                yi->main_rect = crop->c;
                                 return 0;
                         } else {
                                 if (!ivtv_vapi(itv, CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, 4,
@@ -878,7 +885,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                 if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
                     (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
                         if (streamtype == IVTV_DEC_STREAM_TYPE_YUV)
-                                crop->c = itv->yuv_info.main_rect;
+                                crop->c = yi->main_rect;
                         else
                                 crop->c = itv->main_rect;
                         return 0;
@@ -1070,11 +1077,10 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                         itv->main_rect.height = itv->params.height;
                         ivtv_vapi(itv, CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, 4,
                                 720, itv->main_rect.height, 0, 0);
-                        itv->yuv_info.main_rect = itv->main_rect;
+                        yi->main_rect = itv->main_rect;
                         if (!itv->osd_info) {
-                                itv->yuv_info.osd_full_w = 720;
-                                itv->yuv_info.osd_full_h =
-                                                itv->is_out_50hz ? 576 : 480;
+                                yi->osd_full_w = 720;
+                                yi->osd_full_h = itv->is_out_50hz ? 576 : 480;
                         }
                 }
                 break;
@@ -1272,6 +1278,8 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                         else
                                 fb->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;
                 }
+                if (yi->track_osd)
+                        fb->flags |= V4L2_FBUF_FLAG_OVERLAY;
                 break;
         }
 
@@ -1285,6 +1293,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                         (fb->flags & (V4L2_FBUF_FLAG_LOCAL_ALPHA|V4L2_FBUF_FLAG_LOCAL_INV_ALPHA)) != 0;
                 itv->osd_chroma_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0;
                 ivtv_set_osd_alpha(itv);
+                yi->track_osd = (fb->flags & V4L2_FBUF_FLAG_OVERLAY) != 0;
                 break;
         }