Commit 41823c03 authored by Christophe Massiot's avatar Christophe Massiot

* modules/mux/mpeg/pes.c: Copy the flags of the data buffer to the PES

  buffer.

* modules/mux/mpeg/ts.c:
  - rename the caching= option into shaping= since it more adequately
    describes what it does
  - new use-key-frames option, if enabled then shaping= will be a
    maximum value, if the algorithm find a new GOP it will finish with
    the first picture of the next GOP (helps minimizing the dts delay)
  - fixed a bug where the calculated sending time could be later than
    the real DTS time (meaning the decoder wouldn't get the buffer
    in time)
parent 81ec7faf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* pes.c: PES packetizer used by the MPEG multiplexers * pes.c: PES packetizer used by the MPEG multiplexers
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: pes.c,v 1.14 2003/12/10 23:16:04 gbazin Exp $ * $Id: pes.c,v 1.15 2004/03/03 11:34:41 massiot Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -311,7 +311,7 @@ int E_( EStoPES )( sout_instance_t *p_sout, ...@@ -311,7 +311,7 @@ int E_( EStoPES )( sout_instance_t *p_sout,
} while( i_size > 0 ); } while( i_size > 0 );
/* sav some space */ /* save some space */
if( p_es_sav->i_size + 10*1024 < p_es_sav->i_buffer_size ) if( p_es_sav->i_size + 10*1024 < p_es_sav->i_buffer_size )
{ {
sout_BufferRealloc( p_sout, p_es_sav, p_es_sav->i_size ); sout_BufferRealloc( p_sout, p_es_sav, p_es_sav->i_size );
...@@ -327,6 +327,7 @@ int E_( EStoPES )( sout_instance_t *p_sout, ...@@ -327,6 +327,7 @@ int E_( EStoPES )( sout_instance_t *p_sout,
i_dts += i_length; i_dts += i_length;
} }
(*pp_pes)->i_flags = p_es_sav->i_flags;
return( 0 ); return( 0 );
} }
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment