/*****************************************************************************
- * pes.c
+ * pes.c: PES packetizer used by the MPEG multiplexers
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: pes.c,v 1.6 2003/06/09 07:16:41 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
#define PES_PAYLOAD_SIZE_MAX 65500
-static inline int PESHeader( uint8_t *p_hdr, mtime_t i_pts, mtime_t i_dts, int i_es_size, int i_stream_id, int i_private_id )
+static inline int PESHeader( uint8_t *p_hdr, mtime_t i_pts, mtime_t i_dts,
+ int i_es_size, int i_stream_id, int i_private_id,
+ vlc_bool_t b_mpeg2 )
{
bits_buffer_t bits;
+ int i_extra = 0;
+
+ /* For PES_PRIVATE_STREAM_1 there is an extra header after the
+ pes header */
+ /* i_private_id != -1 because TS use 0xbd without private_id */
+ if( i_stream_id == PES_PRIVATE_STREAM_1 && i_private_id != -1 )
+ {
+ i_extra = 1;
+ if( ( i_private_id & 0xf0 ) == 0x80 )
+ {
+ i_extra += 3;
+ }
+ }
+
bits_initwrite( &bits, 30, p_hdr );
default:
/* arg, a little more difficult */
-// if( b_mpeg2 ) // FIXME unsupported
+ if( b_mpeg2 )
{
- int i_pts_dts;
- int i_extra = 0;
+ int i_pts_dts;
- /* For PES_PRIVATE_STREAM_1 there is an extra header after the
- pes header */
- if( i_stream_id == PES_PRIVATE_STREAM_1 )
- {
- i_extra = 1;
- if( ( i_private_id&0xf0 ) == 0x80 )
- {
- i_extra += 3;
- }
- }
-
- if( i_pts >= 0 && i_dts >= 0 )
+ if( i_pts > 0 && i_dts > 0 )
{
bits_write( &bits, 16, i_es_size + i_extra+ 13 );
i_pts_dts = 0x03;
}
- else if( i_pts >= 0 )
+ else if( i_pts > 0 )
{
bits_write( &bits, 16, i_es_size + i_extra + 8 );
i_pts_dts = 0x02;
bits_write( &bits, 1, 0x01 ); // marker
}
}
+ else /* MPEG1 */
+ {
+ int i_pts_dts;
+
+ if( i_pts > 0 && i_dts > 0 )
+ {
+ bits_write( &bits, 16, i_es_size + i_extra + 10 /* + stuffing */ );
+ i_pts_dts = 0x03;
+ }
+ else if( i_pts > 0 )
+ {
+ bits_write( &bits, 16, i_es_size + i_extra + 5 /* + stuffing */ );
+ i_pts_dts = 0x02;
+ }
+ else
+ {
+ bits_write( &bits, 16, i_es_size + i_extra + 1 /* + stuffing */);
+ i_pts_dts = 0x00;
+ }
+
+ /* FIXME: Now should be stuffing */
+
+ /* No STD_buffer_scale and STD_buffer_size */
+
+ /* write pts */
+ if( i_pts_dts & 0x02 )
+ {
+ bits_write( &bits, 4, i_pts_dts ); // '0010' or '0011'
+ bits_write( &bits, 3, i_pts >> 30 );
+ bits_write( &bits, 1, 0x01 ); // marker
+ bits_write( &bits, 15, i_pts >> 15 );
+ bits_write( &bits, 1, 0x01 ); // marker
+ bits_write( &bits, 15, i_pts );
+ bits_write( &bits, 1, 0x01 ); // marker
+ }
+ /* write i_dts */
+ if( i_pts_dts & 0x01 )
+ {
+ bits_write( &bits, 4, 0x01 ); // '0001'
+ bits_write( &bits, 3, i_dts >> 30 );
+ bits_write( &bits, 1, 0x01 ); // marker
+ bits_write( &bits, 15, i_dts >> 15 );
+ bits_write( &bits, 1, 0x01 ); // marker
+ bits_write( &bits, 15, i_dts );
+ bits_write( &bits, 1, 0x01 ); // marker
+ }
+ if( !i_pts_dts )
+ {
+ bits_write( &bits, 8, 0x0F );
+ }
+
+ }
+
/* now should be stuffing */
/* and then pes data */
}
int E_( EStoPES )( sout_instance_t *p_sout,
- sout_buffer_t **pp_pes,
- sout_buffer_t *p_es,
+ block_t **pp_pes,
+ block_t *p_es,
int i_stream_id,
int b_mpeg2 )
{
- sout_buffer_t *p_es_sav, *p_pes;
- mtime_t i_pts, i_dts;
+ block_t *p_pes;
+ mtime_t i_pts, i_dts, i_length;
uint8_t *p_data;
int i_size;
int i_pes_payload;
int i_pes_header;
+ int i_pes_count = 1;
+
/* HACK for private stream 1 in ps */
if( ( i_stream_id >> 8 ) == PES_PRIVATE_STREAM_1 )
{
i_stream_id = PES_PRIVATE_STREAM_1;
}
- i_pts = p_es->i_pts * 9 / 100; // 90000 units clock
- i_dts = p_es->i_dts * 9 / 100; // 90000 units clock
+ i_pts = p_es->i_pts <= 0 ? 0 : p_es->i_pts * 9 / 100; // 90000 units clock
+ i_dts = p_es->i_dts <= 0 ? 0 : p_es->i_dts * 9 / 100; // 90000 units clock
- i_size = p_es->i_size;
+ i_size = p_es->i_buffer;
p_data = p_es->p_buffer;
*pp_pes = p_pes = NULL;
- p_es_sav = p_es;
do
{
i_pes_payload = __MIN( i_size, PES_PAYLOAD_SIZE_MAX );
- i_pes_header = PESHeader( header, i_pts, i_dts, i_pes_payload, i_stream_id, i_private_id );
- i_dts = -1; // only first PES has a dts
+ i_pes_header = PESHeader( header, i_pts, i_dts, i_pes_payload,
+ i_stream_id, i_private_id, b_mpeg2 );
+ i_dts = 0; // only first PES has a dts/pts
+ i_pts = 0;
- if( p_es )
+ if( p_es )
{
- if( sout_BufferReallocFromPreHeader( p_sout, p_es, i_pes_header ) )
- {
- msg_Err( p_sout, "cannot realloc prehader (should never happen)" );
- return( -1 );
- }
+ p_es = block_Realloc( p_es, i_pes_header, p_es->i_buffer );
/* reuse p_es for first frame */
*pp_pes = p_pes = p_es;
/* don't touch i_dts, i_pts, i_length as are already set :) */
}
else
{
- p_pes->p_next = sout_BufferNew( p_sout, i_pes_header + i_pes_payload );
+ p_pes->p_next = block_New( p_sout, i_pes_header + i_pes_payload );
p_pes = p_pes->p_next;
p_pes->i_dts = 0;
p_pes->i_length = 0;
if( i_pes_payload > 0 )
{
- p_sout->p_vlc->pf_memcpy( p_pes->p_buffer + i_pes_header, p_data, i_pes_payload );
+ p_sout->p_vlc->pf_memcpy( p_pes->p_buffer + i_pes_header,
+ p_data, i_pes_payload );
}
+ i_pes_count++;
}
/* copy header */
i_size -= i_pes_payload;
p_data += i_pes_payload;
- p_pes->i_size = i_pes_header + i_pes_payload;
+ p_pes->i_buffer = i_pes_header + i_pes_payload;
} while( i_size > 0 );
- /* sav some space */
- if( p_es_sav->i_size + 10*1024 < p_es_sav->i_buffer_size )
+ /* Now redate all pes */
+ i_dts = (*pp_pes)->i_dts;
+ i_length = (*pp_pes)->i_length / i_pes_count;
+ for( p_pes = *pp_pes; p_pes != NULL; p_pes = p_pes->p_next )
{
- sout_BufferRealloc( p_sout, p_es_sav, p_es_sav->i_size );
- }
+ p_pes->i_dts = i_dts;
+ p_pes->i_length = i_length;
+ i_dts += i_length;
+ }
return( 0 );
}
-
-