mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-29 04:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

mux/ogg: Don't use granulepos = UINT64_MAX on EOS page

Browse Source 
It isn't legal for granulepos to be UINT64_MAX on an EOS page since
this special value indicates that no packets finish on the page, yet
an EOS page signifies that the final packet does finish on the page.

It seems that there is a convention for repeating the last used
granulepos in the EOS page per logical stream.  This then allows
some extra file size hints (duration = last gp - first gp) [1]

[1] This is flawed -- EOS may occur anywhere, however this is what
some people do.

Signed-off-by: David Flynn <davidf@rd.bbc.co.uk>
Signed-off-by: Laurent Aimar <fenrir@videolan.org>
This commit is contained in:
David Flynn 2008-11-27 11:58:52 +00:00 committed by Laurent Aimar
parent faa5af57d0
commit 85dd1a0b76
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mux/ogg.c
View File

@ -184,6 +184,7 @@ typedef struct
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;
@ -851,7 +852,7 @@ static block_t *OggCreateFooter( sout_mux_t *p_mux )
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 );
@ -866,7 +867,7 @@ static block_t *OggCreateFooter( sout_mux_t *p_mux )
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 );
@ -1039,6 +1040,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
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 ||