/*****************************************************************************
* 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>
*
* 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>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-
-#include "codecs.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_codecs.h>
#include <ogg/ogg.h>
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-vlc_module_begin();
- 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 );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("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 )
+vlc_module_end ()
/*****************************************************************************
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 */
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++ )
{
/* 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;
}
/*****************************************************************************
- * Definitions of structures and functions used by this plugins
+ * Definitions of structures and functions used by this plugins
*****************************************************************************/
typedef struct
{
int i_packet_no;
int i_serial_no;
int i_keyframe_granule_shift; /* Theora only */
+ int i_last_keyframe; /* dirac and eventually theora */
+ uint64_t u_last_granulepos; /* Used for correct EOS page */
ogg_stream_state os;
oggds_header_t *p_oggds_header;
msg_Info( p_mux, "Open" );
p_sys = malloc( sizeof( sout_mux_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
p_sys->i_streams = 0;
p_sys->i_add_streams = 0;
p_sys->i_del_streams = 0;
/* 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 */
*****************************************************************************/
static int Control( sout_mux_t *p_mux, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
+ VLC_UNUSED(p_mux);
+ bool *pb_bool;
char **ppsz;
switch( i_query )
{
case MUX_CAN_ADD_STREAM_WHILE_MUXING:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- *pb_bool = VLC_TRUE;
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = true;
return VLC_SUCCESS;
case MUX_GET_ADD_STREAM_WAIT:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- *pb_bool = VLC_TRUE;
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = true;
return VLC_SUCCESS;
case MUX_GET_MIME:
msg_Dbg( p_mux, "adding input" );
- p_input->p_sys = p_stream = malloc( sizeof( ogg_stream_t ) );
+ p_input->p_sys = p_stream = calloc( 1, sizeof( ogg_stream_t ) );
+ if( !p_stream )
+ return VLC_ENOMEM;
p_stream->i_cat = p_input->p_fmt->i_cat;
p_stream->i_fourcc = p_input->p_fmt->i_codec;
switch( p_stream->i_fourcc )
{
- 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' ):
- 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) );
+ case VLC_CODEC_MP4V:
+ case VLC_CODEC_MPGV:
+ case VLC_CODEC_DIV3:
+ case VLC_CODEC_MJPG:
+ case VLC_CODEC_WMV1:
+ case VLC_CODEC_WMV2:
+ case VLC_CODEC_WMV3:
+ case VLC_CODEC_SNOW:
+ p_stream->p_oggds_header = calloc( 1, sizeof(oggds_header_t) );
+ if( !p_stream->p_oggds_header )
+ {
+ free( p_stream );
+ return VLC_ENOMEM;
+ }
p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER;
memcpy( p_stream->p_oggds_header->stream_type, "video", 5 );
- if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'v' ) )
+ if( p_stream->i_fourcc == VLC_CODEC_MP4V )
{
memcpy( p_stream->p_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_CODEC_DIV3 )
{
memcpy( p_stream->p_oggds_header->sub_type, "DIV3", 4 );
}
SetDWLE( &p_stream->p_oggds_header->i_size,
sizeof( oggds_header_t ) - 1 );
SetQWLE( &p_stream->p_oggds_header->i_time_unit,
- I64C(10000000) * p_input->p_fmt->video.i_frame_rate_base /
+ INT64_C(10000000) * p_input->p_fmt->video.i_frame_rate_base /
(int64_t)p_input->p_fmt->video.i_frame_rate );
SetQWLE( &p_stream->p_oggds_header->i_samples_per_unit, 1 );
SetDWLE( &p_stream->p_oggds_header->i_default_len, 1 ); /* ??? */
msg_Dbg( p_mux, "%4.4s stream", (char *)&p_stream->i_fourcc );
break;
- case VLC_FOURCC( 't', 'h', 'e', 'o' ):
+ case VLC_CODEC_DIRAC:
+ msg_Dbg( p_mux, "dirac stream" );
+ break;
+
+ case VLC_CODEC_THEORA:
msg_Dbg( p_mux, "theora stream" );
break;
default:
- FREE( p_input->p_sys );
+ FREENULL( p_input->p_sys );
return VLC_EGENERIC;
}
break;
case AUDIO_ES:
switch( p_stream->i_fourcc )
{
- case VLC_FOURCC( 'v', 'o', 'r', 'b' ):
+ case VLC_CODEC_VORBIS:
msg_Dbg( p_mux, "vorbis stream" );
break;
- case VLC_FOURCC( 's', 'p', 'x', ' ' ):
+ case VLC_CODEC_SPEEX:
msg_Dbg( p_mux, "speex stream" );
break;
- case VLC_FOURCC( 'f', 'l', 'a', 'c' ):
+ case VLC_CODEC_FLAC:
msg_Dbg( p_mux, "flac stream" );
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;
}
p_stream->p_oggds_header =
malloc( sizeof(oggds_header_t) + p_input->p_fmt->i_extra );
+ if( !p_stream->p_oggds_header )
+ {
+ free( p_stream );
+ return VLC_ENOMEM;
+ }
memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) );
p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER;
memset( p_stream->p_oggds_header->sub_type, 0, 4 );
sprintf( p_stream->p_oggds_header->sub_type, "%-x", i_tag );
- SetQWLE( &p_stream->p_oggds_header->i_time_unit, I64C(10000000) );
+ SetQWLE( &p_stream->p_oggds_header->i_time_unit, INT64_C(10000000) );
SetDWLE( &p_stream->p_oggds_header->i_default_len, 1 );
SetDWLE( &p_stream->p_oggds_header->i_buffer_size, 30*1024 );
SetQWLE( &p_stream->p_oggds_header->i_samples_per_unit,
case SPU_ES:
switch( p_stream->i_fourcc )
{
- case VLC_FOURCC( 's', 'u','b', 't' ):
- p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) );
- memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) );
+ case VLC_CODEC_SUBT:
+ p_stream->p_oggds_header = calloc( 1, sizeof(oggds_header_t) );
+ if( !p_stream->p_oggds_header )
+ {
+ free( p_stream );
+ return VLC_ENOMEM;
+ }
p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER;
memcpy( p_stream->p_oggds_header->stream_type, "text", 4 );
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;
}
- p_stream->b_new = VLC_TRUE;
+ p_stream->b_new = true;
p_sys->i_add_streams++;
{
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 &&
}
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--;
}
}
static block_t *OggStreamFlush( sout_mux_t *p_mux,
ogg_stream_state *p_os, mtime_t i_pts )
{
+ (void)p_mux;
block_t *p_og, *p_og_first = NULL;
ogg_page og;
static block_t *OggStreamPageOut( sout_mux_t *p_mux,
ogg_stream_state *p_os, mtime_t i_pts )
{
+ (void)p_mux;
block_t *p_og, *p_og_first = NULL;
ogg_page og;
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;
{
sout_input_t *p_input = p_mux->pp_inputs[i];
ogg_stream_t *p_stream = (ogg_stream_t*)p_input->p_sys;
- p_stream->b_new = VLC_FALSE;
+ p_stream->b_new = false;
msg_Dbg( p_mux, "creating header for %4.4s",
(char *)&p_stream->i_fourcc );
ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
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' ) )
+ if( p_stream->i_fourcc == VLC_CODEC_VORBIS ||
+ p_stream->i_fourcc == VLC_CODEC_SPEEX ||
+ p_stream->i_fourcc == VLC_CODEC_THEORA )
{
/* First packet in order: vorbis/speex/theora info */
p_extra = p_input->p_fmt->p_extra;
p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
/* Get keyframe_granule_shift for theora granulepos calculation */
- if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
+ if( p_stream->i_fourcc == VLC_CODEC_THEORA )
{
int i_keyframe_frequency_force =
1 << ((op.packet[40] << 6 >> 3) | (op.packet[41] >> 5));
}
}
}
- else if( p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
+ else if( p_stream->i_fourcc == VLC_CODEC_DIRAC )
+ {
+ op.packet = p_input->p_fmt->p_extra;
+ op.bytes = p_input->p_fmt->i_extra;
+ 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 if( p_stream->i_fourcc == VLC_CODEC_FLAC )
{
/* 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;
sout_input_t *p_input = p_mux->pp_inputs[i];
ogg_stream_t *p_stream = (ogg_stream_t*)p_input->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' ) )
+ if( p_stream->i_fourcc == VLC_CODEC_VORBIS ||
+ p_stream->i_fourcc == VLC_CODEC_SPEEX ||
+ p_stream->i_fourcc == VLC_CODEC_THEORA )
{
/* Special case, headers are already there in the incoming stream.
* We need to gather them an mark them as headers. */
int j = 2;
- if( p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) j = 1;
+ if( p_stream->i_fourcc == VLC_CODEC_SPEEX ) j = 1;
p_extra = p_input->p_fmt->p_extra;
i_extra = p_input->p_fmt->i_extra;
block_ChainAppend( &p_hdr, p_og );
}
}
- else if( p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
+ else if( p_stream->i_fourcc != VLC_CODEC_FLAC &&
+ p_stream->i_fourcc != VLC_CODEC_DIRAC )
{
uint8_t com[128];
int i_com;
/* comment */
com[0] = PACKET_TYPE_COMMENT;
- i_com = snprintf( &com[1], 127, PACKAGE_VERSION" stream output" )
+ i_com = snprintf( (char *)(com+1), 127,
+ PACKAGE_VERSION" stream output" )
+ 1;
op.packet = com;
op.bytes = i_com;
}
/* 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' ) ) &&
+ if( ( p_stream->i_fourcc == VLC_CODEC_MP4V ||
+ p_stream->i_fourcc == VLC_CODEC_FLAC ) &&
p_input->p_fmt->i_extra )
{
/* Send a packet with the VOL data for mp4v
msg_Dbg( p_mux, "writing extra data" );
op.bytes = p_input->p_fmt->i_extra;
op.packet = p_input->p_fmt->p_extra;
- if( p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
+ if( p_stream->i_fourcc == VLC_CODEC_FLAC )
{
/* Skip the flac stream marker */
op.bytes -= 4;
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++ )
op.bytes = 0;
op.b_o_s = 0;
op.e_o_s = 1;
- op.granulepos = -1;
+ op.granulepos = p_stream->u_last_granulepos;
op.packetno = p_stream->i_packet_no++;
ogg_stream_packetin( &p_stream->os, &op );
op.bytes = 0;
op.b_o_s = 0;
op.e_o_s = 1;
- op.granulepos = -1;
+ op.granulepos = p_sys->pp_del_streams[i]->u_last_granulepos;
op.packetno = p_sys->pp_del_streams[i]->i_packet_no++;
ogg_stream_packetin( &p_sys->pp_del_streams[i]->os, &op );
{
i_count++;
}
+
+ if( i_count == 0 ) return; /* ignore. */
+
i_delta = i_length / i_count;
for( p_tmp = p_og; p_tmp != NULL; p_tmp = p_tmp->p_next )
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;
}
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 );
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' ) )
+ if( p_stream->i_fourcc != VLC_CODEC_VORBIS &&
+ p_stream->i_fourcc != VLC_CODEC_FLAC &&
+ p_stream->i_fourcc != VLC_CODEC_SPEEX &&
+ p_stream->i_fourcc != VLC_CODEC_THEORA &&
+ p_stream->i_fourcc != VLC_CODEC_DIRAC )
{
p_data = block_Realloc( p_data, 1, p_data->i_buffer );
p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME
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_CODEC_VORBIS ||
+ p_stream->i_fourcc == VLC_CODEC_FLAC ||
+ p_stream->i_fourcc == VLC_CODEC_SPEEX )
{
/* 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);
+ (mtime_t)p_input->p_fmt->audio.i_rate / INT64_C(1000000);
}
else if( p_stream->p_oggds_header )
{
/* 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);
+ p_stream->p_oggds_header->i_samples_per_unit / INT64_C(1000000);
}
}
else if( p_stream->i_cat == VIDEO_ES )
{
- if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
+ if( p_stream->i_fourcc == VLC_CODEC_THEORA )
{
/* 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;
+ INT64_C(1000000) ) << p_stream->i_keyframe_granule_shift;
+ }
+ else if( p_stream->i_fourcc == VLC_CODEC_DIRAC )
+ {
+ mtime_t dt = (p_data->i_dts - p_sys->i_start_dts + 1)
+ * p_input->p_fmt->video.i_frame_rate *2
+ / p_input->p_fmt->video.i_frame_rate_base
+ / INT64_C(1000000);
+ mtime_t delay = (p_data->i_pts - p_data->i_dts + 1)
+ * p_input->p_fmt->video.i_frame_rate *2
+ / p_input->p_fmt->video.i_frame_rate_base
+ / INT64_C(1000000);
+ if( p_data->i_flags & BLOCK_FLAG_TYPE_I )
+ p_stream->i_last_keyframe = dt;
+ mtime_t dist = dt - p_stream->i_last_keyframe;
+ op.granulepos = dt << 31 | (dist&0xff00) << 14
+ | (delay&0x1fff) << 9 | (dist&0xff);
}
else if( p_stream->p_oggds_header )
- op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * I64C(10) /
+ op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * INT64_C(10) /
p_stream->p_oggds_header->i_time_unit;
}
else if( p_stream->i_cat == SPU_ES )
{
- /* granulepos is in milisec */
+ /* granulepos is in millisec */
op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000;
}
+ p_stream->u_last_granulepos = op.granulepos;
ogg_stream_packetin( &p_stream->os, &op );
if( p_stream->i_cat == SPU_ES ||
- p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) )
+ p_stream->i_fourcc == VLC_CODEC_SPEEX ||
+ p_stream->i_fourcc == VLC_CODEC_DIRAC )
{
- /* 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 */
+ /* The OggDirac mapping suggests ever so strongly that a
+ * page flush occurs after each OggDirac packet, so to make
+ * the timestamps unambiguous */
p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts );
}
else
projects / vlc / blobdiff