Changeset a8de7281d4590f2562f934849de40ab6e1669d5a

Timestamp:

26/10/07 10:35:53 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

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

git-parent:

[0afe6776db69252dbba8dbb5a6bbe51f8f1c4822]

git-author:

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

Message:

Use p_block->i_dts as spu->i_start instead of p_block->i_pts. This fixes timing issues while transcoding and streaming Teletext subtitles as DVB subtitles.

Files:

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

modules/codec/zvbi.c

@@ -184 +184 @@
-#endif
-
+    p_sys->b_update = VLC_FALSE;
-    p_sys->p_vbi_dec = vbi_decoder_new();
-    p_sys->p_dvb_demux = vbi_dvb_pes_demux_new( NULL, NULL );
@@ -259 +260 @@
-    if( (pp_block == NULL) || (*pp_block == NULL) )
-        return NULL;
+
-    p_block = *pp_block;
-    *pp_block = NULL;
@@ -291 +293 @@
-        goto error;
-
+    p_sys->b_update = VLC_FALSE;
-    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",
@@ -335 +337 @@
-    p_spu->i_flags = SUBPICTURE_ALIGN_TOP;
-
-p
+d
-    p_spu->i_stop = (mtime_t) 0;
-    p_spu->b_ephemer = VLC_TRUE;
@@ -388 +390 @@
-        vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic, fmt_in.i_chroma,
-                        fmt_in.i_width, fmt_in.i_height, fmt_in.i_aspect );
-
-        if( !p_pic->i_planes )
-        {
@@ -493 +494 @@
-    decoder_sys_t   *p_sys = (decoder_sys_t *) p_dec->p_sys;
-    uint32_t        *p_begin, *p_end;
-       int
+int   
-    vbi_opacity     opacity;
-
@@ -508 +509 @@
-        case VLC_FOURCC('R','G','B','A' ):
-            p_begin = (uint32_t *)(*p_src)->p->p_pixels;
-
+
+
-            break;
-        case VLC_FOURCC('Y','U','V','A' ):
@@ -537 +539 @@
-        /* Full text transparency. only foreground color is show */
-        case VBI_TRANSPARENT_FULL:
+            *p_begin = 0;
+            break;
-        /* Transparency for boxed text */
-        case VBI_SEMI_TRANSPARENT:
- 
+
-                *p_begin = 0;
-            break;
-        default:
-            break;
-        }