Changeset 2293854f363396b56fc15db8d903e26e1b631383

Timestamp:

10/07/07 22:15:14 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1184098514 +0000

git-parent:

[52576d03b9960f225aa40d6c4e1c29e5701925be]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1184098514 +0000

Message:

* Adds a raster animation to text tagged with <karaoke> tags (like in USF

files)The timing of the raster is determined by t= tags contained within
the tags. For a demonstration of karaoke refer to the sample file attached.

* Support for bi-directional text needs to behave inside karaoke

tags. (In right to left text the raster needs to move from right to left
instead of left to right - it is supporting this feature that makes this
patch a little more complicated than it would otherwise be)

* Made the internal handling of font color and alpha tags more consistent

and convenient in a few places by storing in one variable as AARRGGBB,
rather than 2.

* Some cleanup of other code.

Patch by Bernie Purcell.

Files:

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

modules/misc/freetype.c

@@ -97 +97 @@
-
-static int SetFontSize( filter_t *, int );
+static void YUVFromRGB( uint32_t i_argb,
+                        uint8_t *pi_y, uint8_t *pi_u, uint8_t *pi_v );
-
-/*****************************************************************************
@@ -194 +196 @@
-     *  b_new_color_mode is set, then it becomes possible to
-     *  have multicoloured text within the subtitles. */
-
+
+
+
-    vlc_bool_t      b_new_color_mode;
-    /** underline information -- only supplied if text should be underlined */
@@ -213 +217 @@
-    char          *psz_name;
-    int            i_size;
-int            i_color;
-int            i_alpha;
+uint32_t       i_color;            /* ARGB */
+uint32_t       i_karaoke_bg_color; /* ARGB */
-
-    font_stack_t  *p_next;
@@ -222 +226 @@
-{
-    int         i_font_size;
-
+
+
-    vlc_bool_t  b_italic;
-    vlc_bool_t  b_bold;
@@ -712 +717 @@
-
-    /* Calculate text color components */
-
-
-
-
-
-
+
+
+
+
-    i_alpha = p_line->i_alpha;
-
@@ -808 +811 @@
-            {
-                /* Every glyph can (and in fact must) have its own color */
-
-
-
-
-
-
-
-
-
-
+
-            }
-
@@ -824 +818 @@
-                for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
-                {
+                    uint8_t i_y_local = i_y;
+                    uint8_t i_u_local = i_u;
+                    uint8_t i_v_local = i_v;
+
+                    if( p_line->p_fg_bg_ratio != 0x00 )
+                    {
+                        int i_split = p_glyph->bitmap.width *
+                                      p_line->p_fg_bg_ratio[ i ] / 0x7f;
+
+                        if( x > i_split )
+                        {
+                            YUVFromRGB( p_line->p_bg_rgb[ i ],
+                                        &i_y_local, &i_u_local, &i_v_local );
+                        }
+                    }
+
-                    if( p_glyph->bitmap.buffer[i_bitmap_offset] )
-                    {
@@ -1155 +1165 @@
-#ifdef HAVE_FONTCONFIG
-static ft_style_t *CreateStyle( char *psz_fontname, int i_font_size,
-int i_font_color, int i_font_alpha
+uint32_t i_font_color, uint32_t i_karaoke_bg_color
-        vlc_bool_t b_italic, vlc_bool_t b_uline )
-{
@@ -1162 +1172 @@
-    if( p_style )
-    {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        p_style->psz_fontname = strdup( psz_fontname );
-    }
@@ -1207 +1214 @@
-
-static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
-int i_color, int i_alpha
+uint32_t i_color, uint32_t i_karaoke_bg_color
-{
-    font_stack_t *p_new;
@@ -1225 +1232 @@
-        p_new->psz_name = NULL;
-
-
-
-alpha  = i_alpha
+           
+           
+karaoke_bg_color  = i_karaoke_bg_color
-
-    if( !*p_font )
@@ -1274 +1281 @@
-
-static int PeekFont( font_stack_t **p_font, char **psz_name, int *i_size,
-int *i_color, int *i_alpha
+uint32_t *i_color, uint32_t *i_karaoke_bg_color
-{
-    font_stack_t *p_last;
@@ -1286 +1293 @@
-    ;
-
-
-
-
-alpha  = p_last->i_alpha
+           
+           
+           
+karaoke_bg_color  = p_last->i_karaoke_bg_color
-
-    return VLC_SUCCESS;
@@ -1355 +1362 @@
-    ft_style_t   *p_style = NULL;
-
-
-int    i_font_color = p_sys->i_font_color
-int    i_font_alpha = 0
-
+     
+uint32_t    i_font_color = p_sys->i_font_color & 0x00ffffff
+uint32_t    i_karaoke_bg_color = i_font_color
+     
-
-    if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size,
-font_alpha ) 
+karaoke_bg_color )
-    {
-        p_style = CreateStyle( psz_fontname, i_font_size, i_font_color,
-font_alpha
+karaoke_bg_color
-    }
-    return p_style;
@@ -1370 +1377 @@
-
-static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
-
-
-
+
+
+
+
-{
-    FT_BBox      line;
@@ -1459 +1467 @@
-        }
-        p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;
-
+
+
+
-
-        line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax -
@@ -1548 +1558 @@
-                                  font_stack_t **p_fonts )
-{
-
-
-
-
-
+
+
+
+
+
+
-
-    /* Default all attributes to the top font in the stack -- in case not
@@ -1561 +1572 @@
-                                 &i_font_size,
-                                 &i_font_color,
-font_alpha
+karaoke_bg_color
-    {
-        psz_fontname = strdup( psz_fontname );
-    }
+    i_font_alpha = (i_font_color >> 24) & 0xff;
+    i_font_color &= 0x00ffffff;
-
-    while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
-    {
- 
- 
+
+
-
-        if( psz_name && psz_value )
@@ -1613 +1626 @@
-                   psz_fontname,
-                   i_font_size,
-i_font_color
-font_alpha
+(i_font_color & 0xffffff) | ((i_font_alpha & 0xff) << 24)
+karaoke_bg_color
-
-    free( psz_fontname );
@@ -1677 +1690 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    int           rv             = VLC_SUCCESS;
@@ -1696 +1797 @@
-    {
-        rv = PushFont( &p_fonts,
-
-
-
-
+
+
+
+
+
+
-
-        if( p_font_style->i_style_flags & STYLE_BOLD )
@@ -1713 +1816 @@
-                       FC_DEFAULT_FONT,
-                       p_sys->i_font_size,
-
-
+00
+x00ffffff
-    }
-    if( rv != VLC_SUCCESS )
@@ -1764 +1867 @@
-                                                          b_uline ) );
-                    }
+                    else if( !strcasecmp( "k", psz_node ) )
+                    {
+                        /* Only valid in karaoke */
+                        if( b_karaoke )
+                        {
+                            if( *pi_k_runs > 0 )
+                            {
+                                SetKaraokeLen( *pi_runs, *ppi_run_lengths,
+                                               *pi_k_runs, *ppi_k_run_lengths );
+                            }
+                            SetupKaraoke( p_xml_reader, pi_k_runs,
+                                          ppi_k_run_lengths, ppi_k_durations );
+                        }
+                    }
-
-                    free( psz_node );
@@ -1803 +1920 @@
-        }
-    }
+    if( b_karaoke )
+    {
+        SetKaraokeLen( *pi_runs, *ppi_run_lengths,
+                       *pi_k_runs, *ppi_k_run_lengths );
+    }
-
-    *pi_len = psz_text - psz_text_orig;
@@ -1811 +1933 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    filter_sys_t   *p_sys = p_filter->p_sys;
-
+
+
+
+
-    uint32_t        i, j, k;
-    int             i_prev;
@@ -1829 +1965 @@
-        return VLC_ENOMEM;
-
+    if( b_karaoke )
+    {
+        pi_karaoke_bar = (uint8_t *) malloc( i_len * sizeof( uint8_t ));
+        /* If we can't allocate sufficient memory for karaoke, continue anyway -
+         * we just won't be able to display the progress bar; at least we'll
+         * get the text.
+         */
+    }
+
-    i = 0;
-    for( j = 0; j < i_runs; j++ )
@@ -1837 +1982 @@
-    {
-        ft_style_t  **pp_char_styles_new;
-
+old_
-        uint32_t    *p_fribidi_string;
-        int start_pos, pos = 0;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            msg_Err( p_filter, "out of memory" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-            free( pp_char_styles );
-            return VLC_ENOMEM;
@@ -1875 +2024 @@
-                p_fribidi_string[pos] = psz_text[pos];
-                pp_char_styles_new[pos] = pp_char_styles[pos];
+                p_new_positions[pos] = pos;
+                p_levels[pos] = 0;
-                ++pos;
-            }
@@ -1889 +2040 @@
-                        pos - start_pos, &base_dir,
-                        (FriBidiChar*)p_fribidi_string + start_pos,
-0
-positions, 0);
-
+p_new_positions + start_pos
+old_positions,
+
-                for( j = (uint32_t) start_pos; j < (uint32_t) pos; j++ )
-                {
-                    pp_char_styles_new[ j ] = pp_char_styles[ start_pos +
-
+
+
-                }
-            }
-        }
-
+old_
-        free( pp_char_styles );
-        pp_char_styles = pp_char_styles_new;
@@ -1906 +2058 @@
-    }
-#endif
+    /* Work out the karaoke */
+    if( pi_karaoke_bar )
+    {
+        int64_t i_last_duration = 0;
+        int64_t i_duration = 0;
+        int64_t i_start_pos = 0;
+        int64_t i_elapsed  = var_GetTime( p_filter, "spu-elapsed" ) / 1000;
+        
+        for( k = 0; k< i_k_runs; k++ )
+        {
+             double fraction = 0.0;
+
+             i_duration += pi_k_durations[ k ];
+
+             if( i_duration < i_elapsed )
+             {
+                 /* Completely finished this run-length -
+                  * let it render normally */
+
+                 fraction = 1.0;
+             }
+             else if( i_elapsed < i_last_duration )
+             {
+                 /* Haven't got up to this segment yet -
+                  * render it completely in karaoke BG mode */
+
+                 fraction = 0.0;
+             }
+             else
+             {
+                 /* Partway through this run */
+
+                 fraction = (double)(i_elapsed - i_last_duration) /
+                            (double)pi_k_durations[ k ];
+             }
+             for( i = 0; i < pi_k_run_lengths[ k ]; i++ )
+             {
+                 double shade = pi_k_run_lengths[ k ] * fraction;
+
+                 if( p_new_positions )
+                     j = p_new_positions[ i_start_pos + i ];
+                 else
+                     j = i_start_pos + i;
+
+                 if( i < (uint32_t)shade )
+                     pi_karaoke_bar[ j ] = 0xff;
+                 else if( (double)i > shade )
+                     pi_karaoke_bar[ j ] = 0x00;
+                 else
+                 {
+                     shade -= (int)shade;
+                     pi_karaoke_bar[ j ] = ((int)(shade * 128.0) & 0x7f) |
+                                   ((p_levels ? (p_levels[ j ] % 2) : 0 ) << 7);
+                 }
+             }
+             
+             i_last_duration = i_duration;
+             i_start_pos += pi_k_run_lengths[ k ];
+        }
+    }
+    if( p_levels )         free( p_levels );
+    if( p_new_positions )  free( p_new_positions );
+
-    FT_Vector tmp_result;
-
@@ -1945 +2160 @@
-                    free( psz_text );
-#endif
+                    if( pi_karaoke_bar )
+                        free( pi_karaoke_bar );
-                    return VLC_EGENERIC;
-                }
@@ -1960 +2177 @@
-                free( psz_text );
-#endif
+                if( pi_karaoke_bar )
+                    free( pi_karaoke_bar );
-                return VLC_EGENERIC;
-            }
@@ -1977 +2196 @@
-                free( psz_text );
-#endif
+                if( pi_karaoke_bar )
+                    free( pi_karaoke_bar );
-                return VLC_ENOMEM;
-            }
@@ -1995 +2216 @@
-                        free( psz_text );
-#endif
+                        if( pi_karaoke_bar )
+                            free( pi_karaoke_bar );
-                        return VLC_ENOMEM;
-                    }
@@ -2015 +2238 @@
-                    else *pp_lines = p_line;
-                }
+
-                if( RenderTag( p_filter, p_face ? p_face : p_sys->p_face,
-                               p_style->i_font_color, p_style->b_underline,
+                               p_style->i_karaoke_bg_color,
-                               p_line, psz_unicode, &i_pen_x, i_pen_y, &i_posn,
-                               &tmp_result ) != VLC_SUCCESS )
@@ -2026 +2251 @@
-                    free( psz_text );
-#endif
+                    if( pi_karaoke_bar )
+                        free( pi_karaoke_bar );
-                    return VLC_EGENERIC;
-                }
+
-                if( *psz_unicode )
-                {
@@ -2046 +2274 @@
-    free( psz_text );
-#endif
-
-    if( p_line )
-    {
@@ -2052 +2279 @@
-        p_result->y += tmp_result.y;
-    }
+
+    if( pi_karaoke_bar )
+    {
+        int i = 0;
+        for( p_line = *pp_lines; p_line; p_line=p_line->p_next )
+        {
+            for( k = 0; p_line->pp_glyphs[ k ]; k++, i++ )
+            {
+                if( (pi_karaoke_bar[ i ] & 0x7f) == 0x7f)
+                {
+                    /* do nothing */
+                }
+                else if( (pi_karaoke_bar[ i ] & 0x7f) == 0x00)
+                {
+                    /* 100% BG colour will render faster if we
+                     * instead make it 100% FG colour, so leave
+                     * the ratio alone and copy the value across
+                     */
+                    p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ];
+                }
+                else
+                {
+                    if( pi_karaoke_bar[ i ] & 0x80 )
+                    {
+                        /* Swap Left and Right sides over for Right aligned
+                         * language text (eg. Arabic, Hebrew)
+                         */
+                        uint32_t i_tmp = p_line->p_fg_rgb[ k ];
+
+                        p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ];
+                        p_line->p_bg_rgb[ k ] = i_tmp;
+                    }
+                    p_line->p_fg_bg_ratio[ k ] = (pi_karaoke_bar[ i ] & 0x7f);
+                }
+            }
+            /* Jump over the '\n' at the line-end */
+            i++;
+        }
+        free( pi_karaoke_bar );
+    }
+
-    return VLC_SUCCESS;
-}
@@ -2075 +2343 @@
-        if( p_xml )
-        {
+            vlc_bool_t b_karaoke = VLC_FALSE;
+
-            p_xml_reader = xml_ReaderCreate( p_xml, p_sub );
+            if( p_xml_reader )
+            {
+                /* Look for Root Node */
+                if( xml_ReaderRead( p_xml_reader ) == 1 )
+                {
+                    char *psz_node = xml_ReaderName( p_xml_reader );
+
+                    if( !strcasecmp( "karaoke", psz_node ) )
+                    {
+                        /* We're going to have to render the text a number
+                         * of times to show the progress marker on the text.
+                         */
+                        var_SetBool( p_filter, "text-rerender", VLC_TRUE );
+                        b_karaoke = VLC_TRUE;
+                    }
+                    else if( !strcasecmp( "text", psz_node ) )
+                    {
+                        b_karaoke = VLC_FALSE;
+                    }
+                    else
+                    {
+                        /* Only text and karaoke tags are supported */
+                        xml_ReaderDelete( p_xml, p_xml_reader );
+                        p_xml_reader = NULL;
+                        rv = VLC_EGENERIC;
+                    }
+
+                    free( psz_node );
+                }
+            }
+
-            if( p_xml_reader )
-            {
@@ -2081 +2382 @@
-                int         i_len;
-                uint32_t    i_runs = 0;
+                uint32_t    i_k_runs = 0;
-                uint32_t   *pi_run_lengths = NULL;
+                uint32_t   *pi_k_run_lengths = NULL;
+                uint32_t   *pi_k_durations = NULL;
-                ft_style_t  **pp_styles = NULL;
-                FT_Vector    result;
@@ -2094 +2398 @@
-                    rv = ProcessNodes( p_filter, p_xml_reader,
-                                  p_region_in->p_style, psz_text, &i_len,
-
+
+
+
-
-                    p_region_out->i_x = p_region_in->i_x;
@@ -2102 +2408 @@
-                    {
-                        rv = ProcessLines( p_filter, psz_text, i_len, i_runs,
-
+
+
+
-                    }
-
@@ -2212 +2520 @@
-    free( p_line->pp_glyphs );
-    free( p_line->p_glyph_pos );
-
+
+
+
-    free( p_line->pi_underline_offset );
-    free( p_line->pi_underline_thickness );
@@ -2242 +2552 @@
-    p_line->pp_glyphs = malloc( sizeof(FT_BitmapGlyph) * ( i_count + 1 ) );
-    p_line->p_glyph_pos = malloc( sizeof( FT_Vector ) * ( i_count + 1 ) );
-
+
+
+
-    p_line->pi_underline_offset = calloc( i_count + 1, sizeof( uint16_t ) );
-    p_line->pi_underline_thickness = calloc( i_count + 1, sizeof( uint16_t ) );
-    if( ( p_line->pp_glyphs == NULL ) ||
-        ( p_line->p_glyph_pos == NULL ) ||
-
+
+
+
-        ( p_line->pi_underline_offset == NULL ) ||
-        ( p_line->pi_underline_thickness == NULL ) )
@@ -2254 +2568 @@
-            free( p_line->pi_underline_thickness );
-        if( p_line->pi_underline_offset ) free( p_line->pi_underline_offset );
-
+
+
+
-        if( p_line->p_glyph_pos ) free( p_line->p_glyph_pos );
-        if( p_line->pp_glyphs ) free( p_line->pp_glyphs );
@@ -2310 +2626 @@
-    return VLC_SUCCESS;
-}
+
+static void YUVFromRGB( uint32_t i_argb,
+                    uint8_t *pi_y, uint8_t *pi_u, uint8_t *pi_v )
+{
+    int i_red   = ( i_argb & 0x00ff0000 ) >> 16;
+    int i_green = ( i_argb & 0x0000ff00 ) >>  8;
+    int i_blue  = ( i_argb & 0x000000ff );
+
+    *pi_y = (uint8_t)__MIN(abs( 2104 * i_red  + 4130 * i_green +
+                      802 * i_blue + 4096 + 131072 ) >> 13, 235);
+    *pi_u = (uint8_t)__MIN(abs( -1214 * i_red  + -2384 * i_green +
+                     3598 * i_blue + 4096 + 1048576) >> 13, 240);
+    *pi_v = (uint8_t)__MIN(abs( 3598 * i_red + -3013 * i_green +
+                      -585 * i_blue + 4096 + 1048576) >> 13, 240);
+}