* ogg.c: ogg muxer module for vlc
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: ogg.c,v 1.17 2003/10/09 19:31:38 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
*****************************************************************************/
#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>
#include <ogg/ogg.h>
/*****************************************************************************
- * Exported prototypes
+ * Module descriptor
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static int Capability(sout_mux_t *, int, void *, void * );
-static int AddStream( sout_mux_t *, sout_input_t * );
-static int DelStream( sout_mux_t *, sout_input_t * );
-static int Mux ( sout_mux_t * );
-
-static sout_buffer_t *OggCreateHeader( sout_mux_t *, mtime_t );
-static sout_buffer_t *OggCreateFooter( sout_mux_t *, mtime_t );
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
vlc_module_begin();
set_description( _("Ogg/ogm muxer") );
set_capability( "sout mux", 10 );
set_callbacks( Open, Close );
vlc_module_end();
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static int Capability(sout_mux_t *, int, void *, void * );
+static int AddStream( sout_mux_t *, sout_input_t * );
+static int DelStream( sout_mux_t *, sout_input_t * );
+static int Mux ( sout_mux_t * );
+
+static block_t *OggCreateHeader( sout_mux_t *, mtime_t );
+static block_t *OggCreateFooter( sout_mux_t *, mtime_t );
+
/*****************************************************************************
* Misc declarations
*****************************************************************************/
} oggds_header_t;
-/* Helper writer functions */
-
-#define SetWLE( p, v ) _SetWLE( (uint8_t*)p, v)
-static void _SetWLE( uint8_t *p, uint16_t i_dw )
-{
- p[1] = ( i_dw >> 8 )&0xff;
- p[0] = ( i_dw )&0xff;
-}
-
-#define SetDWLE( p, v ) _SetDWLE( (uint8_t*)p, v)
-static void _SetDWLE( uint8_t *p, uint32_t i_dw )
-{
- p[3] = ( i_dw >> 24 )&0xff;
- p[2] = ( i_dw >> 16 )&0xff;
- p[1] = ( i_dw >> 8 )&0xff;
- p[0] = ( i_dw )&0xff;
-}
-#define SetQWLE( p, v ) _SetQWLE( (uint8_t*)p, v)
-static void _SetQWLE( uint8_t *p, uint64_t i_qw )
-{
- SetDWLE( p, i_qw&0xffffffff );
- SetDWLE( p+4, ( i_qw >> 32)&0xffffffff );
-}
-
/*
* TODO move this function to src/stream_output.c (used by nearly all muxers)
*/
for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
{
- sout_fifo_t *p_fifo;
+ block_fifo_t *p_fifo;
p_fifo = p_mux->pp_inputs[i]->p_fifo;
( p_mux->pp_inputs[i]->p_fmt->i_cat == SPU_ES &&
p_fifo->i_depth > 0 ) )
{
- sout_buffer_t *p_buf;
+ block_t *p_buf;
- p_buf = sout_FifoShow( p_fifo );
+ p_buf = block_FifoShow( p_fifo );
if( i_stream < 0 || p_buf->i_dts < i_dts )
{
i_dts = p_buf->i_dts;
else
{
// wait that all fifo have at least 3 packets (3 vorbis headers)
- return( -1 );
+ return -1;
}
}
if( pi_stream )
{
*pi_dts = i_dts;
}
- return( i_stream );
+ return i_stream;
}
/*****************************************************************************
oggds_header_t oggds_header;
- sout_buffer_t *pp_sout_headers[3];
+ block_t *pp_sout_headers[3];
int i_sout_headers;
} ogg_stream_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;
ogg_stream_t **pp_del_streams;
};
-static void OggSetDate( sout_buffer_t *, mtime_t , mtime_t );
-static sout_buffer_t *OggStreamFlush( sout_mux_t *, ogg_stream_state *,
- mtime_t );
+static void OggSetDate( block_t *, mtime_t , mtime_t );
+static block_t *OggStreamFlush( sout_mux_t *, ogg_stream_state *, mtime_t );
/*****************************************************************************
* Open: Open muxer
p_mux->pf_addstream = AddStream;
p_mux->pf_delstream = DelStream;
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;
}
if( p_sys->i_del_streams )
{
- sout_buffer_t *p_og = NULL;
+ block_t *p_og = NULL;
mtime_t i_dts = -1;
int i;
/* Close the current ogg stream */
msg_Dbg( p_mux, "writing footer" );
- sout_BufferChain( &p_og, OggCreateFooter( p_mux, 0 ) );
+ block_ChainAppend( &p_og, OggCreateFooter( p_mux, 0 ) );
/* Remove deleted logical streams */
for( i = 0; i < p_sys->i_del_streams; i++ )
case SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME:
*(vlc_bool_t*)p_answer = VLC_TRUE;
return( SOUT_MUX_CAP_ERR_OK );
+ case SOUT_MUX_CAP_GET_ADD_STREAM_WAIT:
+ *(vlc_bool_t*)p_answer = VLC_TRUE;
+ return( SOUT_MUX_CAP_ERR_OK );
default:
return( SOUT_MUX_CAP_ERR_UNIMPLEMENTED );
}
msg_Dbg( p_mux, "adding input" );
- p_input->p_sys = (void *)p_stream = malloc( sizeof( ogg_stream_t ) );
+ p_input->p_sys = 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;
switch( p_input->p_fmt->i_cat )
{
case VIDEO_ES:
+ if( !p_input->p_fmt->video.i_frame_rate ||
+ !p_input->p_fmt->video.i_frame_rate_base )
+ {
+ msg_Warn( p_mux, "Missing frame rate, assuming 25fps" );
+ p_input->p_fmt->video.i_frame_rate = 25;
+ p_input->p_fmt->video.i_frame_rate_base = 1;
+ }
+
switch( p_stream->i_fourcc )
{
- case VLC_FOURCC( 'm', 'p','4', 'v' ):
- case VLC_FOURCC( 'D', 'I','V', '3' ):
+ case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
+ case VLC_FOURCC( 'm', 'p', '4', 'v' ):
+ case VLC_FOURCC( 'D', 'I', 'V', '3' ):
+ case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
+ case VLC_FOURCC( 'W', 'M', 'V', '1' ):
+ case VLC_FOURCC( 'W', 'M', 'V', '2' ):
memcpy( p_stream->oggds_header.stream_type, "video", 5 );
- if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p','4', 'v' ) )
+ if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'v' ) )
{
memcpy( p_stream->oggds_header.sub_type, "XVID", 4 );
}
- else if( p_stream->i_fourcc == VLC_FOURCC( 'D', 'I','V', '3' ) )
+ else if( p_stream->i_fourcc == VLC_FOURCC( 'D', 'I', 'V', '3' ) )
{
memcpy( p_stream->oggds_header.sub_type, "DIV3", 4 );
}
+ else
+ {
+ memcpy(p_stream->oggds_header.sub_type,&p_stream->i_fourcc,4);
+ }
SetDWLE( &p_stream->oggds_header.i_size,
sizeof( oggds_header_t ) - 1);
SetQWLE( &p_stream->oggds_header.i_time_unit,
- I64C(10000000)/(int64_t)25 ); // FIXME (25fps)
+ I64C(10000000) * p_input->p_fmt->video.i_frame_rate_base /
+ (int64_t)p_input->p_fmt->video.i_frame_rate );
SetQWLE( &p_stream->oggds_header.i_samples_per_unit, 1 );
SetDWLE( &p_stream->oggds_header.i_default_len, 1 ); /* ??? */
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 );
- msg_Dbg( p_mux, "mp4v/div3 stream" );
+ p_input->p_fmt->video.i_height );
+ msg_Dbg( p_mux, "%4.4s stream", (char *)&p_stream->i_fourcc );
break;
case VLC_FOURCC( 't', 'h', 'e', 'o' ):
default:
FREE( p_input->p_sys );
- return( VLC_EGENERIC );
+ return VLC_EGENERIC;
}
break;
case AUDIO_ES:
switch( p_stream->i_fourcc )
{
- case VLC_FOURCC( 'm', 'p','g', 'a' ):
- case VLC_FOURCC( 'a', '5','2', ' ' ):
+ case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+ case VLC_FOURCC( 'a', '5', '2', ' ' ):
memcpy( p_stream->oggds_header.stream_type, "audio", 5 );
- if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p','g', 'a' ) )
+ if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', 'g', 'a' ) )
{
memcpy( p_stream->oggds_header.sub_type, "55 ", 4 );
}
- else if( p_stream->i_fourcc == VLC_FOURCC( 'a', '5','2', ' ' ) )
+ else if( p_stream->i_fourcc == VLC_FOURCC( 'a', '5', '2', ' ' ) )
{
memcpy( p_stream->oggds_header.sub_type, "2000", 4 );
}
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;
msg_Dbg( p_mux, "vorbis stream" );
break;
+ case VLC_FOURCC( 's', 'p', 'x', ' ' ):
+ msg_Dbg( p_mux, "speex stream" );
+ break;
+
+ case VLC_FOURCC( 'f', 'l', 'a', 'c' ):
+ msg_Dbg( p_mux, "flac stream" );
+ break;
+
default:
FREE( p_input->p_sys );
- return( VLC_EGENERIC );
+ return VLC_EGENERIC;
}
break;
default:
FREE( p_input->p_sys );
- return( VLC_EGENERIC );
+ return VLC_EGENERIC;
}
break;
default:
FREE( p_input->p_sys );
- return( VLC_EGENERIC );
+ return VLC_EGENERIC;
}
p_stream->b_new = VLC_TRUE;
p_sys->i_add_streams++;
- return( VLC_SUCCESS );
+ return VLC_SUCCESS;
}
/*****************************************************************************
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
ogg_stream_t *p_stream = (ogg_stream_t*)p_input->p_sys;
- sout_buffer_t *p_og;
+ block_t *p_og;
msg_Dbg( p_mux, "removing input" );
{
int i;
- if( ( p_og = OggStreamFlush( p_mux, &p_stream->os, 0 ) ) )
+ if( !p_stream->b_new &&
+ ( p_og = OggStreamFlush( p_mux, &p_stream->os, 0 ) ) )
{
OggSetDate( p_og, p_stream->i_dts, p_stream->i_length );
sout_AccessOutWrite( p_mux->p_access, p_og );
for( i = 0; i < p_stream->i_sout_headers; i++ )
{
- sout_BufferDelete( p_mux->p_sout, p_stream->pp_sout_headers[i] );
+ block_Release( p_stream->pp_sout_headers[i] );
p_stream->i_sout_headers = 0;
}
else
{
/* Wasn't already added so get rid of it */
- ogg_stream_clear( &p_stream->os );
FREE( p_stream );
p_sys->i_add_streams--;
}
p_input->p_sys = NULL;
- return( 0 );
+ return 0;
}
/*****************************************************************************
* Ogg bitstream manipulation routines
*****************************************************************************/
-static sout_buffer_t *OggStreamFlush( sout_mux_t *p_mux,
- ogg_stream_state *p_os, mtime_t i_pts )
+static block_t *OggStreamFlush( sout_mux_t *p_mux,
+ ogg_stream_state *p_os, mtime_t i_pts )
{
- sout_buffer_t *p_og, *p_og_first = NULL;
- ogg_page og;
+ block_t *p_og, *p_og_first = NULL;
+ ogg_page og;
- for( ;; )
+ while( ogg_stream_flush( p_os, &og ) )
{
- /* flush all data */
- int i_result;
- int i_size;
- if( ( i_result = ogg_stream_flush( p_os, &og ) ) == 0 )
- {
- break;
- }
-
- i_size = og.header_len + og.body_len;
- p_og = sout_BufferNew( p_mux->p_sout, i_size);
+ /* Flush all data */
+ p_og = block_New( p_mux, og.header_len + og.body_len );
memcpy( p_og->p_buffer, og.header, og.header_len );
memcpy( p_og->p_buffer + og.header_len, og.body, og.body_len );
- p_og->i_size = i_size;
p_og->i_dts = 0;
p_og->i_pts = i_pts;
p_og->i_length = 0;
- i_pts = 0; // write it only once
+ i_pts = 0; // write it only once
- sout_BufferChain( &p_og_first, p_og );
+ block_ChainAppend( &p_og_first, p_og );
}
- return( p_og_first );
+ return p_og_first;
}
-static sout_buffer_t *OggStreamPageOut( sout_mux_t *p_mux,
- ogg_stream_state *p_os, mtime_t i_pts )
+static block_t *OggStreamPageOut( sout_mux_t *p_mux,
+ ogg_stream_state *p_os, mtime_t i_pts )
{
- sout_buffer_t *p_og, *p_og_first = NULL;
- ogg_page og;
+ block_t *p_og, *p_og_first = NULL;
+ ogg_page og;
- for( ;; )
+ while( ogg_stream_pageout( p_os, &og ) )
{
- /* flush all data */
- int i_result;
- int i_size;
- if( ( i_result = ogg_stream_pageout( p_os, &og ) ) == 0 )
- {
- break;
- }
-
- i_size = og.header_len + og.body_len;
- p_og = sout_BufferNew( p_mux->p_sout, i_size);
+ /* Flush all data */
+ p_og = block_New( p_mux, og.header_len + og.body_len );
memcpy( p_og->p_buffer, og.header, og.header_len );
memcpy( p_og->p_buffer + og.header_len, og.body, og.body_len );
- p_og->i_size = i_size;
p_og->i_dts = 0;
p_og->i_pts = i_pts;
p_og->i_length = 0;
- i_pts = 0; // write them only once
+ i_pts = 0; // write them only once
- sout_BufferChain( &p_og_first, p_og );
+ block_ChainAppend( &p_og_first, p_og );
}
- return( p_og_first );
+ return p_og_first;
}
-static sout_buffer_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
+static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
{
- sout_buffer_t *p_hdr = NULL;
- sout_buffer_t *p_og;
+ block_t *p_hdr = NULL;
+ block_t *p_og;
ogg_packet op;
int i;
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 );
+ p_og = block_FifoGet( p_mux->pp_inputs[i]->p_fifo );
op.packet = p_og->p_buffer;
- op.bytes = p_og->i_size;
+ op.bytes = p_og->i_buffer;
op.b_o_s = 1;
op.e_o_s = 0;
op.granulepos = 0;
OggStreamFlush( p_mux, &p_stream->os, 0 );
p_stream->i_sout_headers++;
}
- p_og = sout_BufferDuplicate( p_mux->p_sout,
- p_stream->pp_sout_headers[0] );
+ p_og = block_Duplicate( p_stream->pp_sout_headers[0] );
/* Get keyframe_granule_shift for theora granulepos calculation */
if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
{
- int i_keyframe_frequency_force = 1 << (op.packet[36] >> 3);
+ int i_keyframe_frequency_force =
+ 1 << ((op.packet[40] << 6 >> 3) | (op.packet[41] >> 5));
/* granule_shift = i_log( frequency_force -1 ) */
p_stream->i_keyframe_granule_shift = 0;
}
}
}
+ else if( p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
+ {
+ /* flac stream marker (yeah, only that in the 1st packet) */
+ op.packet = "fLaC";
+ op.bytes = 4;
+ op.b_o_s = 1;
+ 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 );
+ }
else
{
/* ds header */
p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
}
- sout_BufferChain( &p_hdr, p_og );
+ block_ChainAppend( &p_hdr, p_og );
}
/* Take care of the non b_o_s headers */
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.
if( p_stream->i_sout_headers < j + 2 )
{
/* next packets in order: comments and codebooks */
- p_og = sout_FifoGet( p_mux->pp_inputs[i]->p_fifo );
+ p_og = block_FifoGet( p_mux->pp_inputs[i]->p_fifo );
op.packet = p_og->p_buffer;
- op.bytes = p_og->i_size;
+ op.bytes = p_og->i_buffer;
op.b_o_s = 0;
op.e_o_s = 0;
op.granulepos = 0;
p_stream->i_sout_headers++;
}
- p_og = sout_BufferDuplicate( p_mux->p_sout,
- p_stream->pp_sout_headers[j+1] );
- sout_BufferChain( &p_hdr, p_og );
+ p_og = block_Duplicate( p_stream->pp_sout_headers[j+1] );
+ block_ChainAppend( &p_hdr, p_og );
}
}
- else
+ else if( p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
{
uint8_t com[128];
int i_com;
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 );
+ block_ChainAppend( &p_hdr, p_og );
+ }
+
+ /* Special case for mp4v and flac */
+ if( ( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'v' ) ||
+ p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) ) &&
+ p_mux->pp_inputs[i]->p_fmt->i_extra )
+ {
+ /* Send a packet with the VOL data for mp4v
+ * or STREAMINFO for flac */
+ msg_Dbg( p_mux, "writing extra data" );
+ op.bytes = p_mux->pp_inputs[i]->p_fmt->i_extra;
+ op.packet = p_mux->pp_inputs[i]->p_fmt->p_extra;
+ if( p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
+ {
+ /* Skip the flac stream marker */
+ op.bytes -= 4;
+ op.packet+= 4;
+ }
+ 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 );
+ block_ChainAppend( &p_hdr, p_og );
}
}
/* set HEADER flag */
for( p_og = p_hdr; p_og != NULL; p_og = p_og->p_next )
{
- p_og->i_flags |= SOUT_BUFFER_FLAGS_HEADER;
+ p_og->i_flags |= BLOCK_FLAG_HEADER;
}
- return( p_hdr );
+ return p_hdr;
}
-static sout_buffer_t *OggCreateFooter( sout_mux_t *p_mux, mtime_t i_dts )
+static block_t *OggCreateFooter( sout_mux_t *p_mux, mtime_t i_dts )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
- sout_buffer_t *p_hdr = NULL;
- sout_buffer_t *p_og;
+ block_t *p_hdr = NULL;
+ block_t *p_og;
ogg_packet op;
int i;
ogg_stream_packetin( &p_stream->os, &op );
p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
- sout_BufferChain( &p_hdr, p_og );
+ block_ChainAppend( &p_hdr, p_og );
ogg_stream_clear( &p_stream->os );
}
ogg_stream_packetin( &p_sys->pp_del_streams[i]->os, &op );
p_og = OggStreamFlush( p_mux, &p_sys->pp_del_streams[i]->os, 0 );
- sout_BufferChain( &p_hdr, p_og );
+ block_ChainAppend( &p_hdr, p_og );
ogg_stream_clear( &p_sys->pp_del_streams[i]->os );
}
- return( p_hdr );
+ return p_hdr;
}
-static void OggSetDate( sout_buffer_t *p_og, mtime_t i_dts, mtime_t i_length )
+static void OggSetDate( block_t *p_og, mtime_t i_dts, mtime_t i_length )
{
int i_count;
- sout_buffer_t *p_tmp;
+ block_t *p_tmp;
mtime_t i_delta;
for( p_tmp = p_og, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->p_next )
static int Mux( sout_mux_t *p_mux )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
- sout_buffer_t *p_og = NULL;
+ block_t *p_og = NULL;
int i_stream;
mtime_t i_dts;
if( MuxGetStream( p_mux, &i_stream, &i_dts) < 0 )
{
msg_Dbg( p_mux, "waiting for data..." );
- return( VLC_SUCCESS );
+ return VLC_SUCCESS;
}
if( p_sys->i_streams )
int i;
msg_Dbg( p_mux, "writing footer" );
- sout_BufferChain( &p_og, OggCreateFooter( p_mux, 0 ) );
+ block_ChainAppend( &p_og, OggCreateFooter( p_mux, 0 ) );
/* Remove deleted logical streams */
for( i = 0; i < p_sys->i_del_streams; i++ )
p_sys->i_streams = p_mux->i_nb_inputs;
p_sys->i_del_streams = 0;
p_sys->i_add_streams = 0;
- sout_BufferChain( &p_og, OggCreateHeader( p_mux, i_dts ) );
+ block_ChainAppend( &p_og, OggCreateHeader( p_mux, i_dts ) );
/* Write header and/or footer */
OggSetDate( p_og, i_dts, 0 );
for( ;; )
{
- sout_input_t *p_input;
- ogg_stream_t *p_stream;
- sout_buffer_t *p_data;
- ogg_packet op;
+ sout_input_t *p_input;
+ ogg_stream_t *p_stream;
+ block_t *p_data;
+ ogg_packet op;
if( MuxGetStream( p_mux, &i_stream, &i_dts) < 0 )
{
- return( VLC_SUCCESS );
+ return VLC_SUCCESS;
}
p_input = p_mux->pp_inputs[i_stream];
p_stream = (ogg_stream_t*)p_input->p_sys;
- p_data = sout_FifoGet( p_input->p_fifo );
+ p_data = block_FifoGet( p_input->p_fifo );
if( p_stream->i_fourcc != VLC_FOURCC( 'v', 'o', 'r', 'b' ) &&
+ p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) &&
+ 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 );
+ p_data = block_Realloc( p_data, 1, p_data->i_buffer );
p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME
}
op.packet = p_data->p_buffer;
- op.bytes = p_data->i_size;
+ op.bytes = p_data->i_buffer;
op.b_o_s = 0;
op.e_o_s = 0;
op.packetno = p_stream->i_packet_no++;
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( 'f', 'l', 'a', 'c' ) ||
+ 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);
+ ( i_dts - p_sys->i_start_dts + p_data->i_length ) *
+ (mtime_t)p_input->p_fmt->audio.i_rate / I64C(1000000);
}
else
{
{
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)
- / I64C(1000000) ) << p_stream->i_keyframe_granule_shift;
+ /* FIXME, we assume only keyframes */
+ op.granulepos = ( ( i_dts - p_sys->i_start_dts ) *
+ p_input->p_fmt->video.i_frame_rate /
+ p_input->p_fmt->video.i_frame_rate_base /
+ I64C(1000000) ) << p_stream->i_keyframe_granule_shift;
}
else
op.granulepos = ( i_dts - p_sys->i_start_dts ) * I64C(10) /
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 */
- sout_BufferChain( &p_og, OggStreamFlush( p_mux, &p_stream->os,
- p_data->i_dts ) );
+ /* 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 );
}
else
{
- sout_BufferChain( &p_og, OggStreamPageOut( p_mux, &p_stream->os,
- p_data->i_dts ) );
+ p_og = OggStreamPageOut( p_mux, &p_stream->os, p_data->i_dts );
}
if( p_og )
p_stream->i_length = 0;
sout_AccessOutWrite( p_mux->p_access, p_og );
-
- p_og = NULL;
}
else
{
p_stream->i_length += p_data->i_length;
}
- sout_BufferDelete( p_mux->p_sout, p_data );
+ block_Release( p_data );
}
- return( VLC_SUCCESS );
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff