/*****************************************************************************
* pes.c: PES packetizer used by the MPEG multiplexers
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 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>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
-#include <string.h>
#include <errno.h>
#include <fcntl.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_common.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include "codecs.h"
+#include <vlc_codecs.h>
#include "pes.h"
#include "bits.h"
-#define PES_PAYLOAD_SIZE_MAX 65500
-
+/** PESHeader, write a pes header
+ * \param i_es_size length of payload data. (Must be < PES_PAYLOAD_SIZE_MAX
+ * unless the conditions for unbounded PES packets are met)
+ * \param i_header_size length of padding data to insert into PES packet
+ * header in bytes.
+ */
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, vlc_bool_t b_data_alignment,
+ int i_es_size, es_format_t *p_fmt,
+ int i_stream_id, int i_private_id,
+ bool b_mpeg2, bool b_data_alignment,
int i_header_size )
{
bits_buffer_t bits;
}
}
-
bits_initwrite( &bits, 50, p_hdr );
/* add start code */
{
int i_pts_dts;
- if( i_pts > 0 && i_dts > 0 && i_pts != i_dts )
+ if( i_pts > 0 && i_dts > 0 &&
+ ( i_pts != i_dts || ( p_fmt->i_cat == VIDEO_ES &&
+ p_fmt->i_codec != VLC_FOURCC('m','p','g','v') ) ) )
{
i_pts_dts = 0x03;
if ( !i_header_size ) i_header_size = 0xa;
if ( !i_header_size ) i_header_size = 0x0;
}
- bits_write( &bits, 16, i_es_size + i_extra + 3
- + i_header_size ); // size
+ /* Unbounded streams are only allowed in TS (not PS) and only
+ * for some ES, eg. MPEG* Video ES or Dirac ES. */
+ if( i_es_size > PES_PAYLOAD_SIZE_MAX )
+ bits_write( &bits, 16, 0 ); // size unbounded
+ else
+ bits_write( &bits, 16, i_es_size + i_extra + 3
+ + i_header_size ); // size
bits_write( &bits, 2, 0x02 ); // mpeg2 id
bits_write( &bits, 2, 0x00 ); // pes scrambling control
bits_write( &bits, 1, 0x00 ); // pes priority
bits_write( &bits, 1, 0x00 ); // dsm trick mode flag
bits_write( &bits, 1, 0x00 ); // additional copy info flag
bits_write( &bits, 1, 0x00 ); // pes crc flag
- bits_write( &bits, 1, 0x00 ); // pes extention flags
+ bits_write( &bits, 1, 0x00 ); // pes extension flags
bits_write( &bits, 8, i_header_size ); // header size -> pts and dts
/* write pts */
{
int i_pts_dts;
- if( i_pts > 0 && i_dts > 0 && i_pts != i_dts )
+ if( i_pts > 0 && i_dts > 0 &&
+ ( i_pts != i_dts || p_fmt->i_cat == VIDEO_ES ) )
{
bits_write( &bits, 16, i_es_size + i_extra + 10 /* + stuffing */ );
i_pts_dts = 0x03;
}
}
-int E_( EStoPES )( sout_instance_t *p_sout,
- block_t **pp_pes,
- block_t *p_es,
- int i_stream_id,
- int b_mpeg2, int b_data_alignment, int i_header_size )
+/** EStoPES, encapsulate an elementary stream block into PES packet(s)
+ * each with a maximal payload size of @i_max_pes_size@.
+ *
+ * In some circumstances, unbounded PES packets are allowed:
+ * - Transport streams only (NOT programme streams)
+ * - Only some types of elementary streams (eg MPEG2 video)
+ * It is the responsibility of the caller to enforce these constraints.
+ *
+ * EStoPES will only produce an unbounded PES packet if:
+ * - ES is VIDEO_ES
+ * - i_max_pes_size > PES_PAYLOAD_SIZE_MAX
+ * - length of p_es > PES_PAYLOAD_SIZE_MAX
+ * If the last condition is not met, a single PES packet is produced
+ * which is not unbounded in length.
+ *
+ * \param i_header_size length of padding data to insert into PES packet
+ * header in bytes.
+ * \param i_max_pes_size maximum length of each pes packet payload.
+ * if zero, uses default maximum.
+ * To allow unbounded PES packets in transport stream
+ * VIDEO_ES, set to INT_MAX.
+ */
+int EStoPES ( sout_instance_t *p_sout, block_t **pp_pes, block_t *p_es,
+ es_format_t *p_fmt, int i_stream_id,
+ int b_mpeg2, int b_data_alignment, int i_header_size,
+ int i_max_pes_size )
{
block_t *p_pes;
mtime_t i_pts, i_dts, i_length;
int i_pes_count = 1;
+ /* NB, Only video ES may have unbounded length */
+ if( !i_max_pes_size ||
+ ( p_fmt->i_cat != VIDEO_ES && i_max_pes_size > PES_PAYLOAD_SIZE_MAX ) )
+ {
+ i_max_pes_size = PES_PAYLOAD_SIZE_MAX;
+ }
+
/* HACK for private stream 1 in ps */
if( ( i_stream_id >> 8 ) == PES_PRIVATE_STREAM_1 )
{
i_stream_id = PES_PRIVATE_STREAM_1;
}
+ if( p_fmt->i_codec == VLC_FOURCC( 'm', 'p','4', 'v' ) &&
+ p_es->i_flags & BLOCK_FLAG_TYPE_I )
+ {
+ /* For MPEG4 video, add VOL before I-frames */
+ p_es = block_Realloc( p_es, p_fmt->i_extra, p_es->i_buffer );
+
+ memcpy( p_es->p_buffer, p_fmt->p_extra, p_fmt->i_extra );
+ }
+
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
*pp_pes = p_pes = NULL;
+#ifndef NDEBUG
+ memset( header, 0, 50 );
+#endif
+
do
{
- i_pes_payload = __MIN( i_size, PES_PAYLOAD_SIZE_MAX );
+ i_pes_payload = __MIN( i_size, i_max_pes_size );
i_pes_header = PESHeader( header, i_pts, i_dts, i_pes_payload,
- i_stream_id, i_private_id, b_mpeg2,
+ p_fmt, i_stream_id, i_private_id, b_mpeg2,
b_data_alignment, i_header_size );
i_dts = 0; // only first PES has a dts/pts
i_pts = 0;
if( p_es )
{
p_es = block_Realloc( p_es, i_pes_header, p_es->i_buffer );
+ p_data = p_es->p_buffer+i_pes_header;
/* 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 :) */
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 );
+ vlc_memcpy( p_pes->p_buffer + i_pes_header, p_data,
+ i_pes_payload );
}
i_pes_count++;
}
i_dts += i_length;
}
- return( 0 );
-}
-
+ return 0;
+}
projects / vlc / blobdiff