/*****************************************************************************
* mpegvideo.c: parse and packetize an MPEG1/2 video stream
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpegvideo.c,v 1.24 2003/12/06 23:25:23 gbazin Exp $
+ * Copyright (C) 2001-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
+ * Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "vlc_block_helper.h"
+#define SYNC_INTRAFRAME_TEXT N_("Sync on intraframe")
+#define SYNC_INTRAFRAME_LONGTEXT N_("Normally the packetizer would " \
+ "sync on the next full frame. This flags instructs the packetizer " \
+ "to sync on the first intraframe found.")
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static void Close( vlc_object_t * );
vlc_module_begin();
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_PACKETIZER );
set_description( _("MPEG-I/II video packetizer") );
set_capability( "packetizer", 50 );
set_callbacks( Open, Close );
+
+ add_bool( "packetizer-mpegvideo-sync-iframe", 0, NULL, SYNC_INTRAFRAME_TEXT,
+ SYNC_INTRAFRAME_LONGTEXT, VLC_TRUE );
vlc_module_end();
/*****************************************************************************
int i_offset;
uint8_t p_startcode[3];
- /* Sequence header and extention */
+ /* Sequence header and extension */
block_t *p_seq;
block_t *p_ext;
/* Current frame being built */
block_t *p_frame;
+ block_t **pp_last;
+
vlc_bool_t b_frame_slice;
mtime_t i_pts;
mtime_t i_dts;
vlc_bool_t b_seq_progressive;
vlc_bool_t b_low_delay;
int i_aspect_ratio_info;
+ vlc_bool_t b_inited;
/* Picture properties */
int i_temporal_ref;
mtime_t i_old_duration;
mtime_t i_last_ref_pts;
- /* Number of pictues since last sequence header */
+ /* Number of pictures since last sequence header */
int i_seq_old;
-
+
+ /* Sync behaviour */
+ vlc_bool_t b_sync_on_intra_frame;
+ vlc_bool_t b_discontinuity;
};
enum {
p_sys->p_seq = NULL;
p_sys->p_ext = NULL;
p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
p_sys->b_frame_slice = VLC_FALSE;
p_sys->i_dts = p_sys->i_pts = 0;
p_sys->i_top_field_first = 0;
p_sys->i_repeat_first_field = 0;
p_sys->i_progressive_frame = 0;
+ p_sys->b_inited = 0;
p_sys->i_interpolated_dts = 0;
p_sys->i_old_duration = 0;
p_sys->i_last_ref_pts = 0;
+ p_sys->b_discontinuity = VLC_FALSE;
+ p_sys->b_sync_on_intra_frame = var_CreateGetBool( p_dec, "packetizer-mpegvideo-sync-iframe" );
+ if( p_sys->b_sync_on_intra_frame )
+ msg_Dbg( p_dec, "syncing happens on intraframe now." );
+
return VLC_SUCCESS;
}
{
block_ChainRelease( p_sys->p_frame );
}
+
+ var_Destroy( p_dec, "packetizer-mpegvideo-sync-iframe" );
free( p_sys );
}
return NULL;
}
- if( (*pp_block)->b_discontinuity )
+ if( (*pp_block)->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
p_sys->i_state = STATE_NOSYNC;
- if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
+ p_sys->b_discontinuity = VLC_TRUE;
+ if( p_sys->p_frame )
+ block_ChainRelease( p_sys->p_frame );
p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
p_sys->b_frame_slice = VLC_FALSE;
+ block_Release( *pp_block );
+ return NULL;
}
block_BytestreamPush( &p_sys->bytestream, *pp_block );
/* Get the new fragment and set the pts/dts */
p_pic = block_New( p_dec, p_sys->i_offset );
+ block_BytestreamFlush( &p_sys->bytestream );
p_pic->i_pts = p_sys->bytestream.p_block->i_pts;
p_pic->i_dts = p_sys->bytestream.p_block->i_dts;
break;
}
+ /* If a discontinuity has been encountered, then wait till
+ * the next Intra frame before continuing with packetizing */
+ if( p_sys->b_discontinuity &&
+ p_sys->b_sync_on_intra_frame )
+ {
+ if( p_pic->i_flags & BLOCK_FLAG_TYPE_I )
+ {
+ msg_Dbg( p_dec, "synced on Intra frame" );
+ p_sys->b_discontinuity = VLC_FALSE;
+ p_pic->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+ }
+ else
+ {
+ p_sys->i_state = STATE_NOSYNC;
+ break;
+ }
+ }
+
/* We've just started the stream, wait for the first PTS.
* We discard here so we can still get the sequence header. */
if( p_sys->i_dts <= 0 && p_sys->i_pts <= 0 &&
break;
}
+ /* When starting the stream we can have the first frame with
+ * a null DTS (i_interpolated_pts is initialized to 0) */
+ if( !p_pic->i_dts ) p_pic->i_dts = p_pic->i_pts;
+
/* So p_block doesn't get re-added several times */
*pp_block = block_BytestreamPop( &p_sys->bytestream );
msg_Dbg( p_dec, "waiting for sequence start" );
if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
p_sys->b_frame_slice = VLC_FALSE;
}
p_sys->i_old_duration = i_duration;
}
+ switch ( p_sys->i_picture_type )
+ {
+ case 0x01:
+ p_pic->i_flags |= BLOCK_FLAG_TYPE_I;
+ break;
+ case 0x02:
+ p_pic->i_flags |= BLOCK_FLAG_TYPE_P;
+ break;
+ case 0x03:
+ p_pic->i_flags |= BLOCK_FLAG_TYPE_B;
+ break;
+ }
+
p_pic->i_length = p_sys->i_interpolated_dts - p_pic->i_dts;
#if 0
/* Reset context */
p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
p_sys->b_frame_slice = VLC_FALSE;
}
p_sys->i_seq_old > p_sys->i_frame_rate/p_sys->i_frame_rate_base )
{
/* Usefull for mpeg1: repeat sequence header every second */
- block_ChainAppend( &p_sys->p_frame,
- block_Duplicate( p_sys->p_seq ) );
+ block_ChainLastAppend( &p_sys->pp_last, block_Duplicate( p_sys->p_seq ) );
if( p_sys->p_ext )
{
- block_ChainAppend( &p_sys->p_frame,
- block_Duplicate( p_sys->p_ext ) );
+ block_ChainLastAppend( &p_sys->pp_last, block_Duplicate( p_sys->p_ext ) );
}
p_sys->i_seq_old = 0;
p_sys->i_frame_rate_base =
code_to_frame_rate[p_frag->p_buffer[7]&0x0f][1];
+ p_dec->fmt_out.video.i_frame_rate = p_sys->i_frame_rate;
+ p_dec->fmt_out.video.i_frame_rate_base = p_sys->i_frame_rate_base;
+
p_sys->b_seq_progressive = VLC_TRUE;
p_sys->b_low_delay = VLC_TRUE;
-#if 0
- msg_Dbg( p_dec, "Size %dx%d fps=%.3f",
+ if ( !p_sys->b_inited )
+ {
+ msg_Dbg( p_dec, "Size %dx%d fps=%.3f",
p_dec->fmt_out.video.i_width, p_dec->fmt_out.video.i_height,
p_sys->i_frame_rate / (float)p_sys->i_frame_rate_base );
-#endif
+ p_sys->b_inited = 1;
+ }
}
else if( p_frag->p_buffer[3] == 0xb5 )
{
/* Extention start code */
if( i_type == 0x01 )
{
+#if 0
static const int mpeg2_aspect[16][2] =
{
{0,1}, {1,1}, {4,3}, {16,9}, {221,100},
{0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1},
{0,1}, {0,1}
};
+#endif
/* sequence extention */
if( p_sys->p_ext) block_Release( p_sys->p_ext );
p_frag->p_buffer[9]&0x80 ? VLC_TRUE : VLC_FALSE;
}
+ /* Do not set aspect ratio : in case we're transcoding,
+ * transcode will take our fmt_out as a fmt_in to libmpeg2.
+ * libmpeg2.c will then believe that the user has requested
+ * a specific aspect ratio, which she hasn't. Thus in case
+ * of aspect ratio change, we're screwed. --Meuuh
+ */
#if 0
p_dec->fmt_out.video.i_aspect =
mpeg2_aspect[p_sys->i_aspect_ratio_info][0] *
}
/* Append the block */
- block_ChainAppend( &p_sys->p_frame, p_frag );
+ block_ChainLastAppend( &p_sys->pp_last, p_frag );
return p_pic;
}
projects / vlc / blobdiff