- rename all clip_top, clip_left, clip_color... to hili_xxxx. that

  "clip" thing has caused too much confusion already since these variables
  define a highlight area.
- add overlay offset support to video_out.c/alphablend/vo drivers
- use overlay offset to implement proper croping of frames when vo
  driver doesn't support it
- add clipping checks to alphablend to avoid buffer overflow, buffer
  "underflow" and wrapping.
- increase vo api number
- note: dxr3 support is incomplete about overlay offset

CVS patchset: 7739
CVS date: 2005/09/24 19:08:26

1 files changed, 14 insertions, 9 deletions

diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 31680992d..12d6b6f02 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.h,v 1.112 2004/10/08 21:08:26 mroi Exp $
+ * $Id: video_out.h,v 1.113 2005/09/24 19:08:26 miguelfreitas Exp $
  *
  *
  * xine version of video_out.h 
@@ -150,6 +150,9 @@ struct vo_frame_s {
   vo_driver_t               *driver;
   xine_stream_t             *stream;
   
+  /* displacement for overlays */
+  int                       overlay_offset_x, overlay_offset_y;
+  
   /* 
    * that part is used only by video_out.c for frame management
    * obs: changing anything here will require recompiling vo drivers
@@ -285,7 +288,7 @@ struct xine_video_port_s {
  * from generic vo functions.
  */
 
-#define VIDEO_OUT_DRIVER_IFACE_VERSION  20
+#define VIDEO_OUT_DRIVER_IFACE_VERSION  21
 
 struct vo_driver_s {
 
@@ -400,13 +403,15 @@ struct vo_overlay_s {
   uint8_t           trans[OVL_PALETTE_SIZE];  /* mixer key table        */
   int               rgb_clut;      /* true if clut was converted to rgb */
 
-  int               clip_top;
-  int               clip_bottom;
-  int               clip_left;
-  int               clip_right;
-  uint32_t          clip_color[OVL_PALETTE_SIZE];
-  uint8_t           clip_trans[OVL_PALETTE_SIZE];
-  int               clip_rgb_clut; /* true if clut was converted to rgb */
+  /* define a highlight area with different colors */
+  int               hili_top;
+  int               hili_bottom;
+  int               hili_left;
+  int               hili_right;
+  uint32_t          hili_color[OVL_PALETTE_SIZE];
+  uint8_t           hili_trans[OVL_PALETTE_SIZE];
+  int               hili_rgb_clut; /* true if clut was converted to rgb */
+  
   int               unscaled;      /* true if it should be blended unscaled */
 };