Changeset 223ebac60de34e1d82cee9a08e9aa041bf3e694c

Timestamp:

20/02/05 17:05:39 (4 years ago)

Author:

Mark Moriarty <markfm@videolan.org>

git-committer:

Mark Moriarty <markfm@videolan.org> 1108915539 +0000

git-parent:

[20f007d0e630028cc15b949454515cf74d89363c]

git-author:

Mark Moriarty <markfm@videolan.org> 1108915539 +0000

Message:

freetype.c Change opacity to 0...255, add --freetype-color hex_RGB shortcut

Files:

• modules/misc/freetype.c (modified) (13 diffs)

modules/misc/freetype.c

@@ -83 +83 @@
-    "If set to something different than 0 this option will override the " \
-    "relative font size " )
-100%
+255
-#define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of overlay text. " \
-
+
+
+
+
-#define FONTSIZER_TEXT N_("Font size")
-#define FONTSIZER_LONGTEXT N_("The size of the fonts used by the osd module" )
@@ -102 +105 @@
-    add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
-                 FONTSIZE_LONGTEXT, VLC_TRUE );
-100
+255
-                 OPACITY_LONGTEXT, VLC_TRUE );
+    add_integer( "freetype-color", 0xFFFFFF, NULL, COLOR_TEXT,
+                 COLOR_LONGTEXT, VLC_TRUE );
-    add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
-                 FONTSIZER_LONGTEXT, VLC_FALSE );
@@ -137 +142 @@
-};
-
-
+
+
-static void FreeString( subpicture_data_t * );
-static void FreeLine( line_desc_t * );
@@ -152 +158 @@
-    FT_Face        p_face;      /* handle to face object */
-    vlc_bool_t     i_use_kerning;
-
+
+
-    uint8_t        pi_gamma[256];
-};
@@ -179 +186 @@
-    p_sys->p_face = 0;
-    p_sys->p_library = 0;
-
+
+
+
+
+
-
-    for( i = 0; i < 256; i++ )
@@ -193 +204 @@
-                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    var_Create( p_filter, "freetype-opacity",
+                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Create( p_filter, "freetype-color",
-                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
@@ -245 +258 @@
-    if( val.i_int )
-    {
-101 ) )  /* valid range 0 to 100%
+256 ) )  /* valid range 0 to 255
-        {
-           p_sys->i_opacity = val.i_int;
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    var_Get( p_filter, "freetype-fontsize", &val );
-    if( val.i_int )
@@ -308 +333 @@
- *****************************************************************************/
-static void Render( filter_t *p_filter, subpicture_t *p_spu,
-
+
+
-{
-    filter_sys_t *p_sys = p_filter->p_sys;
@@ -315 +341 @@
-    video_format_t fmt;
-    int i, x, y, i_pitch;
+    uint8_t i_y, i_u, i_v;  /* YUV values, derived from incoming RGB */
+    
+    /* calculate text color components: */
+    i_y = (uint8_t) (0.257 * red) + (0.504 * green) + (0.098 * blue) + 16;
+    i_u = (uint8_t) -(0.148 * red) - (0.291 * green) + (0.439 * blue) + 128;
+    i_v = (uint8_t) (0.439 * red) - (0.368 * green) - (0.071 * blue) + 128;
-
-    /* Create a new subpicture region */
@@ -344 +376 @@
-
-#define pi_gamma p_sys->pi_gamma
-
+
-
-    for( p_line = p_string->p_lines; p_line != NULL; p_line = p_line->p_next )
@@ -373 +405 @@
-                    i_offset -= i_pitch;
-                    p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] +
-200
+512
-                    i_offset += i_pitch; x--;
-                    p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] +
-200
+512
-                    x += 2;
-                    p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] +
-200
+512
-                    i_offset += i_pitch; x--;
-                    p_a[i_offset + x] = ((uint16_t)p_a[i_offset + x] +
-200
+512
-                    i_offset -= i_pitch;
-                }
@@ -397 +429 @@
-               {
-                   p_y[i_offset + x] =
-
+
+
-               }
-               i_offset += i_pitch;
@@ -660 +693 @@
-#undef glyph
-
-
+
+
-    FreeString( p_string );
-    block_Release( p_block );