Changeset 09b646affc8be98f194ce09d59484423423b696c

Timestamp:

05/06/08 10:57:47 (2 months ago)

Author:

Jean-Paul Saman <jean-paul.saman@m2x.nl>

git-committer:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1210064267 +0200

git-parent:

[4dd87e5b15e3c55a90642027f256479942731815]

git-author:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1210061091 +0200

Message:

Cleanup and add workaround for FPGA bug.

Files:

• modules/gui/fbosd.c (modified) (20 diffs)

modules/gui/fbosd.c

@@ -2 +2 @@
- * fbosd.c : framebuffer osd plugin for vlc
- *****************************************************************************
-
+-2008
- * $Id$
- *
@@ -51 +51 @@
-#include <vlc_strings.h>
-
- 1
+
-
-/*****************************************************************************
@@ -67 +67 @@
-
-/* Load modules needed for rendering and blending */
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-static int  OpenBlending     ( intf_thread_t * );
-static void CloseBlending    ( intf_thread_t * );
@@ -92 +92 @@
-                             char * );
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-static int BlendPicture( intf_thread_t *, video_format_t *,
-                         video_format_t *, picture_t *, picture_t * );
@@ -193 +193 @@
-                FBOSD_LONGTEXT, true );
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-    add_integer_with_range( "fbosd-alpha", 255, 0, 255, NULL, ALPHA_TEXT,
-                            ALPHA_LONGTEXT, true );
@@ -276 +276 @@
-    /* Image and Picture rendering */
-    image_handler_t *p_image;
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-    filter_t *p_blend;                              /* alpha blending module */
-#endif
@@ -345 +345 @@
-    }
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-    p_sys->i_alpha = var_CreateGetIntegerCommand( p_intf, "fbosd-alpha" );
-    var_AddCallback( p_intf, "fbosd-alpha", OverlayCallback, NULL );
@@ -454 +454 @@
-    Init( p_intf );
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-    /* Load the blending module */
-    if( OpenBlending( p_intf ) )
@@ -501 +501 @@
-    p_sys->b_clear = false;
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-    var_DelCallback( p_intf, "fbosd-alpha", OverlayCallback, NULL );
-    var_Destroy( p_intf, "fbosd-alpha" );
@@ -540 +540 @@
-    }
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-    if( p_sys->p_blend ) CloseBlending( p_intf );
-#endif
@@ -556 +556 @@
-}
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-static int OpenBlending( intf_thread_t *p_intf )
-{
@@ -771 +771 @@
-}
-
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-/*****************************************************************************
- * BlendPicture: Blend two pictures together..
@@ -823 +823 @@
-#endif
-
+static int InvertAlpha( intf_thread_t *p_intf, picture_t **p_pic, video_format_t fmt )
+{
+    uint8_t *p_begin = NULL, *p_end = NULL;
+    uint8_t i_skip = 0;
+
+    if( *p_pic && ((*p_pic)->i_planes != 1) )
+    {
+        msg_Err( p_intf,
+                 "cannot invert alpha channel too many planes %d (only 1 supported)",
+                 (*p_pic)->i_planes );
+        return VLC_EGENERIC;
+    }
+
+    switch( fmt.i_chroma )
+    {
+        case VLC_FOURCC('R','V','2','4'):
+            p_begin = (uint8_t *)(*p_pic)->p[Y_PLANE].p_pixels;
+            p_end   = (uint8_t *)(*p_pic)->p[Y_PLANE].p_pixels +
+                      ( fmt.i_height * (*p_pic)->p[Y_PLANE].i_pitch );
+            i_skip = 3;
+            break;
+        case VLC_FOURCC('R','V','3','2'):
+            p_begin = (uint8_t *)(*p_pic)->p[Y_PLANE].p_pixels;
+            p_end   = (uint8_t *)(*p_pic)->p[Y_PLANE].p_pixels +
+                      ( fmt.i_height * (*p_pic)->p[Y_PLANE].i_pitch );
+            i_skip = 4;
+            break;
+        default:
+            msg_Err( p_intf, "cannot invert alpha channel chroma not supported %4.4s",
+                    (char *)&fmt.i_chroma );
+            return VLC_EGENERIC;
+    }
+
+    for( ; p_begin < p_end; p_begin += i_skip )
+    {
+        uint8_t i_opacity;
+
+        if( i_opacity != 0xFF )
+            i_opacity = 255 - *p_begin;
+        *p_begin = i_opacity;
+    }
+    /* end of kludge */
+    return VLC_SUCCESS;
+}
+
-/*****************************************************************************
- * RenderPicture: Render the picture into the p_dest buffer.
@@ -923 +968 @@
-                                           p_region, p_region );
-
-
-
-
-
-
+
-            fmt_out = p_region->fmt;
-            fmt_out.i_bits_per_pixel = 32;
@@ -942 +983 @@
-            }
-            vout_CopyPicture( VLC_OBJECT(p_intf), p_dest, &p_region->picture );
+#else
+            fmt_out.i_chroma = p_fmt->i_chroma;
+            p_dest = ConvertImage( p_intf, &p_region->picture,
+                                   &p_region->fmt, &fmt_out );
-#endif
-            if( p_region->picture.pf_release )
@@ -981 +1026 @@
-}
-
-ndef FBOSD_BLENDING
+ ! defined(FBOSD_BLENDING)
-/*****************************************************************************
- * Convertmage: Convert image to another fourcc
@@ -1244 +1289 @@
-    {
-        picture_t *p_text;
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-        video_format_t fmt_in;
-        memset( &fmt_in, 0, sizeof(video_format_t) );
@@ -1281 +1326 @@
-    render->i_y = p_sys->i_y;
-    render->i_pos = p_sys->i_pos;
-#ifdef FBOSD_BLENDING
-    render->i_alpha = p_sys->i_alpha;
-#endif
-    render->b_absolute = p_sys->b_absolute;
-    render->i_state = FBOSD_STATE_FREE;
@@ -1341 +1384 @@
-        {
-            int ret;
+#if defined(FBOSD_BLENDING)
+            /* Reverse alpha channel to work around FPGA bug */
+            InvertAlpha( p_intf, &p_sys->p_overlay, p_sys->fmt_out );
+#endif
-            ret = write( p_sys->i_fd, p_sys->p_overlay->p[0].p_pixels,
-                         p_sys->i_page_size );
@@ -1461 +1508 @@
-            p_sys->render[i].text_style.i_font_alpha = 255 - newval.i_int;
-        }
-def FBOSD_BLENDING
+ defined(FBOSD_BLENDING)
-        else if( !strncmp( psz_cmd, "fbosd-alpha", 11 ) )
-        {