* all: remove sout_format_t and use es_format_t instead.

[vlc] / modules / mux / ogg.c

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index b2a7f31293d0ad54ad7ca61d054d93a66edf3400..3e84a6f615a285a6b8a1b6a9548ee1ada1948d89 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -2,7 +2,7 @@
  * ogg.c: ogg muxer module for vlc
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ogg.c,v 1.16 2003/10/09 18:53:01 gbazin Exp $
+ * $Id: ogg.c,v 1.21 2003/11/21 15:32:08 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -27,7 +27,10 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
+
+#ifdef HAVE_TIME_H
+#   include <time.h>
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>
@@ -174,7 +177,6 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
             sout_buffer_t *p_buf;
 
             p_buf = sout_FifoShow( p_fifo );
-            if( p_buf->i_dts ) // To ignore vorbis and theora header packets
             if( i_stream < 0 || p_buf->i_dts < i_dts )
             {
                 i_dts = p_buf->i_dts;
@@ -227,6 +229,7 @@ struct sout_mux_sys_t
     int     i_streams;
 
     mtime_t i_start_dts;
+    int     i_next_serial_no;
 
     /* number of logical streams pending to be added */
     int i_add_streams;
@@ -263,6 +266,12 @@ static int Open( vlc_object_t *p_this )
     p_mux->pf_mux       = Mux;
     p_mux->i_preheader  = 1;
 
+    /* First serial number is random.
+     * (Done like this because on win32 you need to seed the random number
+     *  generator once per thread). */
+    srand( (unsigned int)time( NULL ) );
+    p_sys->i_next_serial_no = rand();
+
     return VLC_SUCCESS;
 }
 
@@ -330,8 +339,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     p_input->p_sys = (void *)p_stream = malloc( sizeof( ogg_stream_t ) );
 
     p_stream->i_cat       = p_input->p_fmt->i_cat;
-    p_stream->i_fourcc    = p_input->p_fmt->i_fourcc;
-    p_stream->i_serial_no = rand();
+    p_stream->i_fourcc    = p_input->p_fmt->i_codec;
+    p_stream->i_serial_no = p_sys->i_next_serial_no++;
     p_stream->i_packet_no = 0;
 
     p_stream->i_sout_headers = 0;
@@ -363,9 +372,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             SetDWLE( &p_stream->oggds_header.i_buffer_size, 1024*1024 );
             SetWLE( &p_stream->oggds_header.i_bits_per_sample, 0 );
             SetDWLE( &p_stream->oggds_header.header.video.i_width,
-                     p_input->p_fmt->i_width );
+                     p_input->p_fmt->video.i_width );
             SetDWLE( &p_stream->oggds_header.header.video.i_height,
-                     p_input->p_fmt->i_height );
+                     p_input->p_fmt->video.i_height );
             msg_Dbg( p_mux, "mp4v/div3 stream" );
             break;
 
@@ -399,12 +408,12 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             SetDWLE( &p_stream->oggds_header.i_default_len, 1 );
             SetDWLE( &p_stream->oggds_header.i_buffer_size, 30*1024 );
             SetQWLE( &p_stream->oggds_header.i_samples_per_unit,
-                     p_input->p_fmt->i_sample_rate );
+                     p_input->p_fmt->audio.i_rate );
             SetWLE( &p_stream->oggds_header.i_bits_per_sample, 0 );
             SetDWLE( &p_stream->oggds_header.header.audio.i_channels,
-                     p_input->p_fmt->i_channels );
+                     p_input->p_fmt->audio.i_channels );
             SetDWLE( &p_stream->oggds_header.header.audio.i_block_align,
-                     p_input->p_fmt->i_block_align );
+                     p_input->p_fmt->audio.i_blockalign );
             SetDWLE( &p_stream->oggds_header.header.audio.i_avgbytespersec, 0);
             msg_Dbg( p_mux, "mpga/a52 stream" );
             break;
@@ -413,6 +422,10 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             msg_Dbg( p_mux, "vorbis stream" );
             break;
 
+        case VLC_FOURCC( 's', 'p', 'x', ' ' ):
+            msg_Dbg( p_mux, "speex stream" );
+            break;
+
         default:
             FREE( p_input->p_sys );
             return( VLC_EGENERIC );
@@ -586,12 +599,13 @@ static sout_buffer_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
         p_stream->i_packet_no = 0;
 
         if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) ||
+            p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ||
             p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
         {
             /* Special case, headers are already there in the
              * incoming stream or we backed them up earlier */
 
-            /* first packet in order: vorbis/theora info */
+            /* first packet in order: vorbis/speex/theora info */
             if( !p_stream->i_sout_headers )
             {
                 p_og = sout_FifoGet( p_mux->pp_inputs[i]->p_fifo );
@@ -646,6 +660,7 @@ static sout_buffer_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
         ogg_stream_t *p_stream = (ogg_stream_t*)p_mux->pp_inputs[i]->p_sys;
 
         if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) ||
+            p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ||
             p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
         {
             /* Special case, headers are already there in the incoming stream.
@@ -692,6 +707,22 @@ static sout_buffer_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
             p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
             sout_BufferChain( &p_hdr, p_og );
         }
+
+        /* Special case for mp4v */
+        if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'v' ) &&
+            p_mux->pp_inputs[i]->p_fmt->i_extra )
+        {
+            /* Send a packet with the VOL data */
+            op.bytes  = p_mux->pp_inputs[i]->p_fmt->i_extra;
+            op.packet = p_mux->pp_inputs[i]->p_fmt->p_extra;
+            op.b_o_s  = 0;
+            op.e_o_s  = 0;
+            op.granulepos = 0;
+            op.packetno = p_stream->i_packet_no++;
+            ogg_stream_packetin( &p_stream->os, &op );
+            p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
+            sout_BufferChain( &p_hdr, p_og );
+        }
     }
 
     /* set HEADER flag */
@@ -851,6 +882,7 @@ static int Mux( sout_mux_t *p_mux )
         p_data   = sout_FifoGet( p_input->p_fifo );
 
         if( p_stream->i_fourcc != VLC_FOURCC( 'v', 'o', 'r', 'b' ) &&
+            p_stream->i_fourcc != VLC_FOURCC( 's', 'p', 'x', ' ' ) &&
             p_stream->i_fourcc != VLC_FOURCC( 't', 'h', 'e', 'o' ) )
         {
             sout_BufferReallocFromPreHeader( p_mux->p_sout, p_data, 1 );
@@ -865,12 +897,13 @@ static int Mux( sout_mux_t *p_mux )
 
         if( p_stream->i_cat == AUDIO_ES )
         {
-            if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) )
+            if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) ||
+                p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) )
             {
                 /* number of sample from begining + current packet */
                 op.granulepos =
                     ( i_dts + p_data->i_length - p_sys->i_start_dts ) *
-                    p_input->p_fmt->i_sample_rate / I64C(1000000);
+                    p_input->p_fmt->audio.i_rate / I64C(1000000);
             }
             else
             {
@@ -884,7 +917,7 @@ static int Mux( sout_mux_t *p_mux )
             if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
             {
                 /* FIXME, we assume only keyframes and 25fps */
-               op.granulepos = ( ( i_dts - p_sys->i_start_dts ) * I64C(25)
+                op.granulepos = ( ( i_dts - p_sys->i_start_dts ) * I64C(25)
                     / I64C(1000000) ) << p_stream->i_keyframe_granule_shift;
             }
             else
@@ -899,9 +932,11 @@ static int Mux( sout_mux_t *p_mux )
 
         ogg_stream_packetin( &p_stream->os, &op );
 
-        if( p_stream->i_cat == SPU_ES )
+        if( p_stream->i_cat == SPU_ES ||
+            p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) )
         {
-            /* Subtitles need to be flushed to be sent on time */
+            /* Subtitles or Speex packets are quite small so they 
+             * need to be flushed to be sent on time */
             sout_BufferChain( &p_og, OggStreamFlush( p_mux, &p_stream->os,
                                                      p_data->i_dts ) );
         }