Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / codec / spudec / spudec.c

diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c
index 080457063b73f005e2dbb4f51d77de2a5e4fce23..95842f985d0bdd9185bb3aababb8133c74613102 100644 (file)
--- a/modules/codec/spudec/spudec.c
+++ b/modules/codec/spudec/spudec.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * spudec.c : SPU decoder thread
  *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2000-2001, 2006 the VideoLAN team
  * $Id$
  *
- * Authors: Samuel Hocevar <sam@zoy.org>
+ * Authors: Sam Hocevar <sam@zoy.org>
  *          Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,14 +19,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/decoder.h>
+#include <vlc_codec.h>
 
 #include "spudec.h"
 
@@ -76,7 +80,7 @@ static int DecoderOpen( vlc_object_t *p_this )
 
     p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
 
-    p_sys->b_packetizer = VLC_FALSE;
+    p_sys->b_packetizer = false;
     p_sys->i_spu_size = 0;
     p_sys->i_spu      = 0;
     p_sys->p_block    = NULL;
@@ -104,7 +108,7 @@ static int PacketizerOpen( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     p_dec->pf_packetize  = Packetize;
-    p_dec->p_sys->b_packetizer = VLC_TRUE;
+    p_dec->p_sys->b_packetizer = true;
     es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
     p_dec->fmt_out.i_codec = VLC_FOURCC( 's','p','u',' ' );
 
@@ -119,7 +123,11 @@ static void Close( vlc_object_t *p_this )
     decoder_t     *p_dec = (decoder_t*)p_this;
     decoder_sys_t *p_sys = p_dec->p_sys;
 
-    if( p_sys->p_block ) block_ChainRelease( p_sys->p_block );
+    if( p_sys->p_block )
+    {
+        block_ChainRelease( p_sys->p_block );
+    }
+
     free( p_sys );
 }
 
@@ -130,28 +138,30 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     block_t       *p_spu_block;
+    subpicture_t  *p_spu;
 
-    if( (p_spu_block = Reassemble( p_dec, pp_block )) )
-    {
-        subpicture_t *p_spu;
+    p_spu_block = Reassemble( p_dec, pp_block );
 
-        p_sys->i_spu = block_ChainExtract( p_spu_block, p_sys->buffer, 65536 );
-        p_sys->i_pts = p_spu_block->i_pts;
-        block_ChainRelease( p_spu_block );
+    if( ! p_spu_block )
+    {
+        return NULL;
+    }
 
-        /* Parse and decode */
-        p_spu = E_(ParsePacket)( p_dec );
+    /* FIXME: what the, we shouldn’t need to allocate 64k of buffer --sam. */
+    p_sys->i_spu = block_ChainExtract( p_spu_block, p_sys->buffer, 65536 );
+    p_sys->i_pts = p_spu_block->i_pts;
+    block_ChainRelease( p_spu_block );
 
-        /* reinit context */
-        p_sys->i_spu_size = 0;
-        p_sys->i_rle_size = 0;
-        p_sys->i_spu      = 0;
-        p_sys->p_block    = NULL;
+    /* Parse and decode */
+    p_spu = E_(ParsePacket)( p_dec );
 
-        return p_spu;
-    }
+    /* reinit context */
+    p_sys->i_spu_size = 0;
+    p_sys->i_rle_size = 0;
+    p_sys->i_spu      = 0;
+    p_sys->p_block    = NULL;
 
-    return NULL;
+    return p_spu;
 }
 
 /*****************************************************************************
@@ -162,21 +172,21 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
     decoder_sys_t *p_sys = p_dec->p_sys;
     block_t       *p_spu = Reassemble( p_dec, pp_block );
 
-    if( p_spu )
+    if( ! p_spu )
     {
-        p_spu->i_dts = p_spu->i_pts;
-        p_spu->i_length = 0;
+        return NULL;
+    }
 
-        /* reinit context */
-        p_sys->i_spu_size = 0;
-        p_sys->i_rle_size = 0;
-        p_sys->i_spu      = 0;
-        p_sys->p_block    = NULL;
+    p_spu->i_dts = p_spu->i_pts;
+    p_spu->i_length = 0;
 
-        return block_ChainGather( p_spu );
-    }
+    /* reinit context */
+    p_sys->i_spu_size = 0;
+    p_sys->i_rle_size = 0;
+    p_sys->i_spu      = 0;
+    p_sys->p_block    = NULL;
 
-    return NULL;
+    return block_ChainGather( p_spu );
 }
 
 /*****************************************************************************
@@ -229,8 +239,9 @@ static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block )
     if( p_sys->i_spu >= p_sys->i_spu_size )
     {
         /* We have a complete sub */
-        msg_Dbg( p_dec, "SPU packets size=%d should be %d",
-                 p_sys->i_spu, p_sys->i_spu_size );
+        if( p_sys->i_spu > p_sys->i_spu_size )
+            msg_Dbg( p_dec, "SPU packets size=%d should be %d",
+                     p_sys->i_spu, p_sys->i_spu_size );
 
         return p_sys->p_block;
     }