X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fsvcdsub.c;h=36f6c0177b8d8f22becf124cbb195fd05bf465bc;hb=95cd7e4e64ff59322c0af1fccc9330ea5b6a971b;hp=0b20b73350333daf36e16a9477741defbacd167d;hpb=724461bdf250e856eb32f6c0b7c51b065e482982;p=vlc

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index 0b20b73350..36f6c0177b 100644
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -34,8 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
-#include "vlc_bits.h"
+#include <vlc_bits.h>
 
 /*****************************************************************************
  * Module descriptor.
@@ -59,7 +58,7 @@ vlc_module_begin ()
     set_capability( "decoder", 50 )
     set_callbacks( DecoderOpen, DecoderClose )
 
-    add_integer ( MODULE_STRING "-debug", 0, NULL,
+    add_integer ( MODULE_STRING "-debug", 0,
                   DEBUG_TEXT, DEBUG_LONGTEXT, true )
 
     add_submodule ()
@@ -142,23 +141,21 @@ static int DecoderOpen( vlc_object_t *p_this )
     decoder_t     *p_dec = (decoder_t*)p_this;
     decoder_sys_t *p_sys;
 
-    if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'o','g','t',' ' ) )
-    {
+    if( p_dec->fmt_in.i_codec != VLC_CODEC_OGT )
         return VLC_EGENERIC;
-    }
 
     p_dec->p_sys = p_sys = calloc( 1, sizeof( decoder_sys_t ) );
     if( p_sys == NULL )
         return VLC_ENOMEM;
 
-    p_sys->i_debug       = config_GetInt( p_this, MODULE_STRING "-debug" );
+    p_sys->i_debug = var_InheritInteger( p_this, MODULE_STRING "-debug" );
 
-    p_sys->i_image       = -1;
+    p_sys->i_image = -1;
 
     p_sys->i_state = SUBTITLE_BLOCK_EMPTY;
     p_sys->p_spu   = NULL;
 
-    es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 'o','g','t',' ' ) );
+    es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_CODEC_OGT );
 
     p_dec->pf_decode_sub = Decode;
     p_dec->pf_packetize  = Packetize;
@@ -262,6 +259,12 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
     uint16_t i_expected_image;
     uint8_t  i_packet, i_expected_packet;
 
+    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+    {
+        block_Release( p_block );
+        return NULL;
+    }
+
     if( p_block->i_buffer < SPU_HEADER_LEN )
     {
         msg_Dbg( p_dec, "invalid packet header (size %zu < %u)" ,
@@ -272,34 +275,6 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
 
     p_buffer = p_block->p_buffer;
 
-    /* Attach to our input thread and see if subtitle is selected. */
-    {
-        vlc_object_t * p_input;
-        vlc_value_t val;
-
-        p_input = vlc_object_find( p_dec, VLC_OBJECT_INPUT, FIND_PARENT );
-
-        if( !p_input ) return NULL;
-
-        if( var_Get( p_input, "sub-track", &val ) )
-        {
-            vlc_object_release( p_input );
-            return NULL;
-        }
-
-        vlc_object_release( p_input );
-        dbg_print( (DECODE_DBG_PACKET),
-                   "val.i_int %x p_buffer[i] %x", val.i_int, p_buffer[1]);
-
-        /* The dummy ES that the menu selection uses has an 0x70 at
-           the head which we need to strip off. */
-        if( val.i_int == -1 || (val.i_int & 0x03) != p_buffer[1] )
-        {
-            dbg_print( DECODE_DBG_PACKET, "subtitle not for us.\n");
-            return NULL;
-        }
-    }
-
     if( p_sys->i_state == SUBTITLE_BLOCK_EMPTY )
     {
         i_expected_image  = p_sys->i_image + 1;
@@ -311,6 +286,8 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
         i_expected_packet = p_sys->i_packet + 1;
     }
 
+    /* The dummy ES that the menu selection uses has an 0x70 at
+       the head which we need to strip off. */
     p_buffer += 2;
 
     if( *p_buffer & 0x80 )
@@ -471,7 +448,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data )
     int i;
 
     /* Allocate the subpicture internal data. */
-    p_spu = decoder_NewSubpicture( p_dec );
+    p_spu = decoder_NewSubpicture( p_dec, NULL );
     if( !p_spu ) return NULL;
 
     p_spu->i_start = p_data->i_pts;
@@ -490,7 +467,8 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data )
        Two candidates are the video and the other possibility would be
        the access module.
     */
-    fmt.i_aspect = VOUT_ASPECT_FACTOR;
+    fmt.i_sar_num = p_sys->i_height;
+    fmt.i_sar_den = p_sys->i_width;
 
     fmt.i_width = fmt.i_visible_width = p_sys->i_width;
     fmt.i_height = fmt.i_visible_height = p_sys->i_height;