Changeset 35467e3f23ef35ac8fc8be8b2de57a3f9c53c826

Timestamp:

19/10/07 00:10:11 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1192745411 +0000

git-parent:

[6535c24d5e4b8b75fb47843655f830b32e57023b]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1192745411 +0000

Message:

Add support for converting RGBA into YUVA using ffmpeg libswscale capabilities when available. This makes the Teletext subtitles streamable with dvbsub encoder/decoder.

Files:

• modules/codec/zvbi.c (modified) (15 diffs)

modules/codec/zvbi.c

@@ -5 +5 @@
- * $Id$
- *
-
+
+
- *
- * This program is free software; you can redistribute it and/or modify
@@ -130 +131 @@
-    /* Positioning of Teletext images */
-    int                     i_align;
+
+    /* Misc */
+#ifdef HAVE_FFMPEG_SWSCALE_H
+    image_handler_t         *p_image;
+#endif
-};
-
@@ -135 +141 @@
-static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
-                        vlc_value_t oldval, vlc_value_t newval, void *p_data );
+static int OpaquePage( decoder_t *p_dec, vbi_page p_page, video_format_t fmt,
+                        picture_t **p_src );
+
-static int Opaque( vlc_object_t *p_this, char const *psz_cmd,
-                   vlc_value_t oldval, vlc_value_t newval, void *p_data );
@@ -162 +171 @@
-        msg_Err( p_dec, "out of memory" );
-        return VLC_ENOMEM;
-
-    }
-    memset( p_sys, 0, sizeof(decoder_sys_t) );
+
+#ifdef HAVE_FFMPEG_SWSCALE_H
+    p_sys->p_image = image_HandlerCreate( VLC_OBJECT(p_dec) );
+    if( !p_sys->p_image )
+    {
+        free( p_sys );
+        msg_Err( p_dec, "out of memory" );
+        return VLC_ENOMEM;
+    }
+#endif
-
-    p_sys->p_vbi_dec = vbi_decoder_new();
@@ -199 +217 @@
-        p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
-    else
+#ifdef HAVE_FFMPEG_SWSCALE_H
+        p_dec->fmt_out.video.i_chroma = VLC_FOURCC('Y','U','V','A');
+#else
-        p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A');
-
+
-    return VLC_SUCCESS;
-}
@@ -212 +233 @@
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
+#ifdef HAVE_FFMPEG_SWSCALE_H
+    if( p_sys->p_image ) image_HandlerDelete( p_sys->p_image );
+#endif
-    if( p_sys->p_vbi_dec ) vbi_decoder_delete( p_sys->p_vbi_dec );
-    if( p_sys->p_dvb_demux ) vbi_dvb_demux_delete( p_sys->p_dvb_demux );
@@ -224 +248 @@
-static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
-{
-
+(decoder_sys_t *) 
-    block_t         *p_block;
-    subpicture_t    *p_spu = NULL;
@@ -233 +257 @@
-    unsigned int    i_left;
-
-    /* part of kludge */
-    uint32_t        *p_begin, *p_end;
-    unsigned        int x = 0, y = 0;
-    vbi_opacity     opacity;
-    /* end part of kludge */
-
-    if( (pp_block == NULL) || (*pp_block == NULL) )
-        return NULL;
@@ -275 +293 @@
-    p_sys->i_last_page = p_sys->i_wanted_page;
-    p_sys->b_update = VLC_FALSE;
+#if 0
-    msg_Dbg( p_dec, "we now have page: %d ready for display",
-             p_sys->i_wanted_page );
-
+
-    /* If there is a page or sub to render, then we do that here */
-    /* Create the subpicture unit */
@@ -289 +308 @@
-    /* Create a new subpicture region */
-    memset( &fmt, 0, sizeof(video_format_t) );
-
+
+
+
+
+
+
-    fmt.i_aspect = p_sys->b_text ? 0 : VOUT_ASPECT_FACTOR;
-    fmt.i_sar_num = fmt.i_sar_den = 1;
@@ -312 +336 @@
-
-    p_spu->i_start = (mtime_t) p_block->i_pts;
-    //msg_Dbg( p_dec, "spu start "I64Fd" pts "I64Fd, p_spu->i_start, p_block->i_pts );
-    p_spu->i_stop = (mtime_t) 0;
-    p_spu->b_ephemer = VLC_TRUE;
@@ -322 +345 @@
-    p_spu->i_original_picture_height = p_page.rows * 10;
-
+#ifdef WORDS_BIGENDIAN
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_BE
+#else
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_LE
+#endif
+
-    if( p_sys->b_text )
-    {
@@ -332 +361 @@
-        p_text[i_total] = '\0';
-        /* Strip off the pagenumber */
-8
+40
-        p_spu->p_region->psz_text = strdup( &p_text[8] );
-
@@ -338 +367 @@
-        msg_Dbg( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                          p_spu->p_region->picture.p->p_pixels, 1, 1 );
+
-        p_spu->p_region->picture.p->i_lines = p_page.rows * 10;
-        p_spu->p_region->picture.p->i_pitch = p_page.columns * 12 * 4;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    vbi_unref_page( &p_page );
@@ -432 +488 @@
-}
-
+static int OpaquePage( decoder_t *p_dec, vbi_page p_page,
+                       video_format_t fmt, picture_t **p_src )
+{
+    decoder_sys_t   *p_sys = (decoder_sys_t *) p_dec->p_sys;
+    uint32_t        *p_begin, *p_end;
+    unsigned        int x = 0, y = 0;
+    vbi_opacity     opacity;
+
+    /* Kludge since zvbi doesn't provide an option to specify opacity. */
+    if( ( fmt.i_chroma != VLC_FOURCC('R','G','B','A' ) ) &&
+        ( fmt.i_chroma != VLC_FOURCC('Y','U','V','A' ) ) )
+    {
+        msg_Err( p_dec, "chroma not supported %4.4s", (char *)&fmt.i_chroma );
+        return VLC_EGENERIC;
+    }
+
+    switch( fmt.i_chroma )
+    {
+        case VLC_FOURCC('R','G','B','A' ):
+            p_begin = (uint32_t *)(*p_src)->p->p_pixels;
+            p_end = (uint32_t *)(*p_src)->p->p_pixels+(fmt.i_width * fmt.i_height);
+            break;
+        case VLC_FOURCC('Y','U','V','A' ):
+            p_begin = (uint32_t *)(*p_src)->p[A_PLANE].p_pixels;
+            p_end = (uint32_t *)(*p_src)->p[A_PLANE].p_pixels +
+                ( (*p_src)->p[A_PLANE].i_lines * (*p_src)->p[A_PLANE].i_pitch );
+            break;
+        default:
+            msg_Err( p_dec, "chroma not supported %4.4s", (char *)&fmt.i_chroma );
+            return VLC_EGENERIC;
+    }
+
+    for( ; p_begin < p_end; p_begin++ )
+    {
+        opacity = p_page.text[ y / 10 * p_page.columns + x / 12 ].opacity;
+        switch( opacity )
+        {
+        /* Show video instead of this character */
+        case VBI_TRANSPARENT_SPACE:
+            *p_begin = 0;
+            break;
+        /* To make the boxed text "closed captioning" transparent
+         * change VLC_TRUE to VLC_FALSE.
+         */
+        case VBI_OPAQUE:
+            if( p_sys->b_opaque )
+                break;
+        /* Full text transparency. only foreground color is show */
+        case VBI_TRANSPARENT_FULL:
+        /* Transparency for boxed text */
+        case VBI_SEMI_TRANSPARENT:
+            if( (*p_begin & 0xffffff00) == 0xff  )
+                *p_begin = 0;
+            break;
+        default:
+            break;
+        }
+        x++;
+        if( x >= fmt.i_width )
+        {
+            x = 0;
+            y++;
+        }
+    }
+    /* end of kludge */
+    return VLC_SUCCESS;
+}
+
-static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
-                        vlc_value_t oldval, vlc_value_t newval, void *p_data )