/*****************************************************************************
* ogg.c: ogg muxer module for vlc
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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
*****************************************************************************/
-#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>
-
-#include "codecs.h"
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_codecs.h>
#include <ogg/ogg.h>
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 );
add_shortcut( "ogg" );
add_shortcut( "ogm" );
set_callbacks( Open, Close );
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 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 );
/*****************************************************************************
* Misc declarations
*****************************************************************************/
-#define FREE( p ) if( p ) { free( p ); (p) = NULL; }
/* Structures used for OggDS headers used in ogm files */
else return -1;
}
- if( pi_stream )
- {
- *pi_stream = i_stream;
- }
- if( pi_dts )
- {
- *pi_dts = i_dts;
- }
+ if( pi_stream ) *pi_stream = i_stream;
+ if( pi_dts ) *pi_dts = i_dts;
return i_stream;
}
/*****************************************************************************
- * Definitions of structures and functions used by this plugins
+ * Definitions of structures and functions used by this plugins
*****************************************************************************/
typedef struct
{
{
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 */
case VLC_FOURCC( 'W', 'M', 'V', '2' ):
case VLC_FOURCC( 'W', 'M', 'V', '3' ):
case VLC_FOURCC( 'S', 'N', 'O', 'W' ):
+ case VLC_FOURCC( 'd', 'r', 'a', 'c' ):
p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) );
memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) );
p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER;
break;
default:
- FREE( p_input->p_sys );
+ FREENULL( p_input->p_sys );
return VLC_EGENERIC;
}
break;
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;
}
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;
}
/* flush all remaining data */
if( p_input->p_sys )
{
+ if( !p_stream->b_new )
+ {
+ while( p_input->p_fifo->i_depth ) MuxBlock( p_mux, p_input );
+ }
+
if( !p_stream->b_new &&
( p_og = OggStreamFlush( p_mux, &p_stream->os, 0 ) ) )
{
}
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--;
}
}
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.packet = (unsigned char *)"fLaC";
op.bytes = 4;
op.b_o_s = 1;
op.e_o_s = 0;
/* comment */
com[0] = PACKET_TYPE_COMMENT;
- i_com = snprintf( &com[1], 128, PACKAGE_VERSION" stream output" )
+ i_com = snprintf( (char *)(com+1), 127,
+ PACKAGE_VERSION" stream output" )
+ 1;
op.packet = com;
op.bytes = i_com;
/* 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;
}
for( ;; )
{
- sout_input_t *p_input;
- ogg_stream_t *p_stream;
- block_t *p_data;
- ogg_packet op;
+ if( MuxGetStream( p_mux, &i_stream, 0 ) < 0 ) return VLC_SUCCESS;
+ MuxBlock( p_mux, p_mux->pp_inputs[i_stream] );
+ }
- 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 = block_FifoGet( p_input->p_fifo );
+static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ ogg_stream_t *p_stream = (ogg_stream_t*)p_input->p_sys;
+ block_t *p_data = block_FifoGet( p_input->p_fifo );
+ block_t *p_og = NULL;
+ ogg_packet op;
- 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' ) )
- {
- p_data = block_Realloc( p_data, 1, p_data->i_buffer );
- p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME
- }
+ 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' ) )
+ {
+ 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_buffer;
- op.b_o_s = 0;
- op.e_o_s = 0;
- op.packetno = p_stream->i_packet_no++;
+ op.packet = p_data->p_buffer;
+ 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_cat == AUDIO_ES )
+ {
+ 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', ' ' ) )
{
- 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_sys->i_start_dts + p_data->i_length ) *
- (mtime_t)p_input->p_fmt->audio.i_rate / I64C(1000000);
- }
- else if( p_stream->p_oggds_header )
- {
- /* number of sample from begining */
- op.granulepos = ( i_dts - p_sys->i_start_dts ) *
- p_stream->p_oggds_header->i_samples_per_unit /
- I64C(1000000);
- }
+ /* number of sample from begining + current packet */
+ op.granulepos =
+ ( p_data->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_cat == VIDEO_ES )
+ else if( p_stream->p_oggds_header )
{
- if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
- {
- /* 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 if( p_stream->p_oggds_header )
- op.granulepos = ( i_dts - p_sys->i_start_dts ) * I64C(10) /
- p_stream->p_oggds_header->i_time_unit;
+ /* number of sample from begining */
+ op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) *
+ p_stream->p_oggds_header->i_samples_per_unit / I64C(1000000);
}
- else if( p_stream->i_cat == SPU_ES )
+ }
+ else if( p_stream->i_cat == VIDEO_ES )
+ {
+ if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
{
- /* granulepos is in milisec */
- op.granulepos = ( i_dts - p_sys->i_start_dts ) / 1000;
+ /* FIXME, we assume only keyframes */
+ op.granulepos = ( ( p_data->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 if( p_stream->p_oggds_header )
+ op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * I64C(10) /
+ p_stream->p_oggds_header->i_time_unit;
+ }
+ else if( p_stream->i_cat == SPU_ES )
+ {
+ /* granulepos is in milisec */
+ op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000;
+ }
- ogg_stream_packetin( &p_stream->os, &op );
+ ogg_stream_packetin( &p_stream->os, &op );
- 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
- * need to be flushed to be sent on time */
- p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts );
- }
- else
- {
- p_og = OggStreamPageOut( p_mux, &p_stream->os, p_data->i_dts );
- }
+ 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
+ * need to be flushed to be sent on time */
+ p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts );
+ }
+ else
+ {
+ p_og = OggStreamPageOut( p_mux, &p_stream->os, p_data->i_dts );
+ }
- if( p_og )
- {
- OggSetDate( p_og, p_stream->i_dts, p_stream->i_length );
- p_stream->i_dts = -1;
- p_stream->i_length = 0;
+ if( p_og )
+ {
+ OggSetDate( p_og, p_stream->i_dts, p_stream->i_length );
+ p_stream->i_dts = -1;
+ p_stream->i_length = 0;
- sout_AccessOutWrite( p_mux->p_access, p_og );
- }
- else
+ sout_AccessOutWrite( p_mux->p_access, p_og );
+ }
+ else
+ {
+ if( p_stream->i_dts < 0 )
{
- if( p_stream->i_dts < 0 )
- {
- p_stream->i_dts = p_data->i_dts;
- }
- p_stream->i_length += p_data->i_length;
+ p_stream->i_dts = p_data->i_dts;
}
-
- block_Release( p_data );
+ p_stream->i_length += p_data->i_length;
}
+ block_Release( p_data );
return VLC_SUCCESS;
}
projects / vlc / blobdiff