]> git.sesse.net Git - vlc/blobdiff - modules/mux/ogg.c
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' of git@git.videolan.org:vlc
[vlc] / modules / mux / ogg.c
diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 2dac02b7b6de6a5ea7b7f79e615db169a3aa8d47..94f25a93fcc66d00c9a9b3860114290d0f5e076f 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * ogg.c: ogg muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -25,18 +25,19 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_TIME_H
 #   include <time.h>
 #endif
 
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#include "codecs.h"
+#include <vlc/vlc.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_codecs.h>
 
 #include <ogg/ogg.h>
 
@@ -47,7 +48,7 @@ static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Ogg/ogm muxer") );
+    set_description( _("Ogg/OGM muxer") );
     set_capability( "sout mux", 10 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_MUX );
@@ -66,13 +67,12 @@ static int DelStream( sout_mux_t *, sout_input_t * );
 static int Mux      ( sout_mux_t * );
 static int MuxBlock ( sout_mux_t *, sout_input_t * );
 
-static block_t *OggCreateHeader( sout_mux_t *, mtime_t );
-static block_t *OggCreateFooter( sout_mux_t *, mtime_t );
+static block_t *OggCreateHeader( sout_mux_t * );
+static block_t *OggCreateFooter( sout_mux_t * );
 
 /*****************************************************************************
  * Misc declarations
  *****************************************************************************/
-#define FREE( p ) if( p ) { free( p ); (p) = NULL; }
 
 /* Structures used for OggDS headers used in ogm files */
 
@@ -136,8 +136,7 @@ typedef struct
 static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
 {
     mtime_t i_dts;
-    int     i_stream;
-    int     i;
+    int     i_stream, i;
 
     for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
     {
@@ -147,9 +146,9 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
 
         /* We don't really need to have anything in the SPU fifo */
         if( p_mux->pp_inputs[i]->p_fmt->i_cat == SPU_ES &&
-            p_fifo->i_depth == 0 ) continue;
+            block_FifoCount( p_fifo ) == 0 ) continue;
 
-        if( p_fifo->i_depth )
+        if( block_FifoCount( p_fifo ) )
         {
             block_t *p_buf;
 
@@ -169,7 +168,7 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
 }
 
 /*****************************************************************************
- * Definitions of structures and functions used by this plugins 
+ * Definitions of structures and functions used by this plugins
  *****************************************************************************/
 typedef struct
 {
@@ -256,17 +255,17 @@ static void Close( vlc_object_t * p_this )
 
         /* Close the current ogg stream */
         msg_Dbg( p_mux, "writing footer" );
-        block_ChainAppend( &p_og, OggCreateFooter( p_mux, 0 ) );
+        block_ChainAppend( &p_og, OggCreateFooter( p_mux ) );
 
         /* Remove deleted logical streams */
         for( i = 0; i < p_sys->i_del_streams; i++ )
         {
             i_dts = p_sys->pp_del_streams[i]->i_dts;
             ogg_stream_clear( &p_sys->pp_del_streams[i]->os );
-            FREE( p_sys->pp_del_streams[i]->p_oggds_header );
-            FREE( p_sys->pp_del_streams[i] );
+            FREENULL( p_sys->pp_del_streams[i]->p_oggds_header );
+            FREENULL( p_sys->pp_del_streams[i] );
         }
-        FREE( p_sys->pp_del_streams );
+        FREENULL( p_sys->pp_del_streams );
         p_sys->i_streams -= p_sys->i_del_streams;
 
         /* Write footer */
@@ -282,6 +281,7 @@ static void Close( vlc_object_t * p_this )
  *****************************************************************************/
 static int Control( sout_mux_t *p_mux, int i_query, va_list args )
 {
+    VLC_UNUSED(p_mux);
     vlc_bool_t *pb_bool;
     char **ppsz;
 
@@ -387,7 +387,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             break;
 
         default:
-            FREE( p_input->p_sys );
+            FREENULL( p_input->p_sys );
             return VLC_EGENERIC;
         }
         break;
@@ -411,7 +411,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             fourcc_to_wf_tag( p_stream->i_fourcc, &i_tag );
             if( i_tag == WAVE_FORMAT_UNKNOWN )
             {
-                FREE( p_input->p_sys );
+                FREENULL( p_input->p_sys );
                 return VLC_EGENERIC;
             }
 
@@ -465,12 +465,12 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             break;
 
         default:
-            FREE( p_input->p_sys );
+            FREENULL( p_input->p_sys );
             return VLC_EGENERIC;
         }
         break;
     default:
-        FREE( p_input->p_sys );
+        FREENULL( p_input->p_sys );
         return VLC_EGENERIC;
     }
 
@@ -497,7 +497,8 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
     {
         if( !p_stream->b_new )
         {
-            while( p_input->p_fifo->i_depth ) MuxBlock( p_mux, p_input );
+            while( block_FifoCount( p_input->p_fifo ) )
+                MuxBlock( p_mux, p_input );
         }
 
         if( !p_stream->b_new &&
@@ -517,9 +518,9 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
         }
         else
         {
-            /* Wasn't already added so get rid of it */
-            FREE( p_stream->p_oggds_header );
-            FREE( p_stream );
+            /* wasn't already added so get rid of it */
+            FREENULL( p_stream->p_oggds_header );
+            FREENULL( p_stream );
             p_sys->i_add_streams--;
         }
     }
@@ -582,7 +583,7 @@ static block_t *OggStreamPageOut( sout_mux_t *p_mux,
     return p_og_first;
 }
 
-static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
+static block_t *OggCreateHeader( sout_mux_t *p_mux )
 {
     block_t *p_hdr = NULL;
     block_t *p_og = NULL;
@@ -777,13 +778,13 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
     return p_hdr;
 }
 
-static block_t *OggCreateFooter( sout_mux_t *p_mux, mtime_t i_dts )
+static block_t *OggCreateFooter( sout_mux_t *p_mux )
 {
     sout_mux_sys_t *p_sys = p_mux->p_sys;
     block_t *p_hdr = NULL;
     block_t *p_og;
     ogg_packet    op;
-    int i;
+    int     i;
 
     /* flush all remaining data */
     for( i = 0; i < p_mux->i_nb_inputs; i++ )
@@ -885,15 +886,15 @@ static int Mux( sout_mux_t *p_mux )
             int i;
 
             msg_Dbg( p_mux, "writing footer" );
-            block_ChainAppend( &p_og, OggCreateFooter( p_mux, 0 ) );
+            block_ChainAppend( &p_og, OggCreateFooter( p_mux ) );
 
             /* Remove deleted logical streams */
             for( i = 0; i < p_sys->i_del_streams; i++ )
             {
-                FREE( p_sys->pp_del_streams[i]->p_oggds_header );
-                FREE( p_sys->pp_del_streams[i] );
+                FREENULL( p_sys->pp_del_streams[i]->p_oggds_header );
+                FREENULL( p_sys->pp_del_streams[i] );
             }
-            FREE( p_sys->pp_del_streams );
+            FREENULL( p_sys->pp_del_streams );
             p_sys->i_streams = 0;
         }
 
@@ -902,7 +903,7 @@ static int Mux( sout_mux_t *p_mux )
         p_sys->i_streams = p_mux->i_nb_inputs;
         p_sys->i_del_streams = 0;
         p_sys->i_add_streams = 0;
-        block_ChainAppend( &p_og, OggCreateHeader( p_mux, i_dts ) );
+        block_ChainAppend( &p_og, OggCreateHeader( p_mux ) );
 
         /* Write header and/or footer */
         OggSetDate( p_og, i_dts, 0 );
@@ -985,7 +986,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
     if( p_stream->i_cat == SPU_ES ||
         p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) )
     {
-        /* Subtitles or Speex packets are quite small so they 
+        /* Subtitles or Speex packets are quite small so they
          * need to be flushed to be sent on time */
         p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts );
     }
Unnamed repository; edit this file 'description' to name the repository.