From 3c2293bb974d9a532cf2e20aaa82ae7f7303a4f8 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Wed, 16 Jan 2013 15:39:00 +0200
Subject: opengl2: support overlay extent. Probably all overlays should be
 drawn over scaled video frame ...

---
 src/video_out/video_out_opengl2.c | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/video_out/video_out_opengl2.c b/src/video_out/video_out_opengl2.c
index f3ff57e7c..8b2c0f305 100644
--- a/src/video_out/video_out_opengl2.c
+++ b/src/video_out/video_out_opengl2.c
@@ -83,6 +83,9 @@ typedef struct {
   int       unscaled;
   int       vid_scale;
   int       type; /* GL_RGBA or GL_BGRA */
+
+  int       extent_width;
+  int       extent_height;
 } opengl2_overlay_t;
 
 
@@ -557,6 +560,8 @@ static int opengl2_process_ovl( opengl2_driver_t *this_gen, vo_overlay_t *overla
   ovl->ovl_x = overlay->x;
   ovl->ovl_y = overlay->y;
   ovl->unscaled = overlay->unscaled;
+  ovl->extent_width = overlay->extent_width;
+  ovl->extent_height = overlay->extent_height;
   if ( overlay->extent_width == -1 )
     ovl->vid_scale = 1;
   else
@@ -626,6 +631,8 @@ static int opengl2_process_rgba_ovl( opengl2_driver_t *this_gen, vo_overlay_t *o
   ovl->ovl_x = overlay->x;
   ovl->ovl_y = overlay->y;
   ovl->unscaled = overlay->unscaled;
+  ovl->extent_width = overlay->extent_width;
+  ovl->extent_height = overlay->extent_height;
   if ( overlay->extent_width == -1 )
     ovl->vid_scale = 1;
   else
@@ -913,9 +920,17 @@ static void opengl2_draw_scaled_overlays( opengl2_driver_t *that, opengl2_frame_
     o = &that->overlays[i];
     if ( o->unscaled )
       continue;
+    /* scaled overlays with known extent:
+       draw overlay over scaled video frame -> more sharpness in overlay */
+    if (o->extent_width > 0 && o->extent_height > 0)
+      continue;
     ox = o->ovl_x; oy = o->ovl_y;
     ow = o->ovl_w; oh = o->ovl_h;
-    if ( o->vid_scale && that->ovl_vid_scale ) {
+    if (o->extent_width > 0 && o->extent_height > 0) {
+      float fx = frame->width / (float)o->extent_width, fy = frame->height / (float)o->extent_height;
+      ox *= fx; oy *= fy;
+      ow *= fx; oh *= fy;
+    } else if ( o->vid_scale && that->ovl_vid_scale ) {
       float fx = frame->width / 720.0, fy = frame->height / 576.0;
       ox *= fx; oy *= fy;
       ow *= fx; oh *= fy;
@@ -937,22 +952,31 @@ static void opengl2_draw_scaled_overlays( opengl2_driver_t *that, opengl2_frame_
 
 static void opengl2_draw_unscaled_overlays( opengl2_driver_t *that )
 {
-  int i;
+  int i, ox, oy, ow, oh;
   opengl2_overlay_t *o;
   
   glEnable( GL_BLEND );
   for ( i=0; i<that->num_ovls; ++i ) {
     o = &that->overlays[i];
-    if ( !o->unscaled )
+    if ( !o->unscaled && (o->extent_width <= 0 || o->extent_height <= 0))
       continue;
+    ox = o->ovl_x; oy = o->ovl_y;
+    ow = o->ovl_w; oh = o->ovl_h;
     glActiveTexture( GL_TEXTURE0 );
     glBindTexture( GL_TEXTURE_RECTANGLE_ARB, o->tex );
 
+    if (!o->unscaled) {
+      float fx = that->sc.gui_width / (float)o->extent_width, fy = that->sc.gui_height / (float)o->extent_height;
+      /* scale to output */
+      ox = fx * ox; oy = fy * oy;
+      ow = fx * ow; oh = fy * oh;
+    }
+
     glBegin( GL_QUADS );
-      glTexCoord2f( 0, 0 );                  glVertex3f( o->ovl_x, o->ovl_y, 0.);
-      glTexCoord2f( 0, o->tex_h );           glVertex3f( o->ovl_x, o->ovl_y + o->ovl_h, 0.);
-      glTexCoord2f( o->tex_w, o->tex_h );    glVertex3f( o->ovl_x + o->ovl_w, o->ovl_y + o->ovl_h, 0.);
-      glTexCoord2f( o->tex_w, 0 );           glVertex3f( o->ovl_x + o->ovl_w, o->ovl_y, 0.);
+      glTexCoord2f( 0, 0 );                  glVertex3f( ox, oy, 0.);
+      glTexCoord2f( 0, o->tex_h );           glVertex3f( ox, oy + oh, 0.);
+      glTexCoord2f( o->tex_w, o->tex_h );    glVertex3f( ox + ow, oy + oh, 0.);
+      glTexCoord2f( o->tex_w, 0 );           glVertex3f( ox + ow, oy, 0.);
     glEnd();
   }
   glDisable( GL_BLEND );
-- 
cgit v1.2.3