/*****************************************************************************
- * mpegvideo.c
+ * mpegvideo.c: parse and packetize an MPEG1/2 video stream
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpegvideo.c,v 1.15 2003/06/10 22:42:59 gbazin Exp $
+ * Copyright (C) 2001-2006 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
+ * 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
*
* 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 <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-#include "codecs.h" /* WAVEFORMATEX BITMAPINFOHEADER */
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_block.h>
+#include <vlc_codec.h>
+#include <vlc_block_helper.h>
+#include "../codec/cc.h"
+#include "packetizer_helper.h"
+
+#define SYNC_INTRAFRAME_TEXT N_("Sync on Intra Frame")
+#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 Intra Frame found.")
/*****************************************************************************
- * Local prototypes
+ * Module descriptor
*****************************************************************************/
-typedef struct packetizer_s
-{
- /* Input properties */
- decoder_fifo_t *p_fifo;
- bit_stream_t bit_stream;
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
- /* Output properties */
- sout_packetizer_input_t *p_sout_input;
- sout_format_t output_format;
+vlc_module_begin ()
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_PACKETIZER )
+ set_description( N_("MPEG-I/II video packetizer") )
+ set_shortname( N_("MPEG Video") )
+ set_capability( "packetizer", 50 )
+ set_callbacks( Open, Close )
- mtime_t i_interpolated_dts;
- mtime_t i_old_duration;
- mtime_t i_last_ref_pts;
- double d_frame_rate;
- int i_progressive_sequence;
- int i_low_delay;
- uint8_t p_sequence_header[150];
- int i_sequence_header_length;
- int i_last_sequence_header;
+ add_bool( "packetizer-mpegvideo-sync-iframe", false, NULL, SYNC_INTRAFRAME_TEXT,
+ SYNC_INTRAFRAME_LONGTEXT, true )
+vlc_module_end ()
-} packetizer_t;
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+struct decoder_sys_t
+{
+ /*
+ * Input properties
+ */
+ packetizer_t packetizer;
+
+ /* Sequence header and extension */
+ block_t *p_seq;
+ block_t *p_ext;
+
+ /* Current frame being built */
+ block_t *p_frame;
+ block_t **pp_last;
+
+ bool b_frame_slice;
+ mtime_t i_pts;
+ mtime_t i_dts;
+
+ /* Sequence properties */
+ int i_frame_rate;
+ int i_frame_rate_base;
+ bool b_seq_progressive;
+ bool b_low_delay;
+ int i_aspect_ratio_info;
+ bool b_inited;
+
+ /* Picture properties */
+ int i_temporal_ref;
+ int i_picture_type;
+ int i_picture_structure;
+ int i_top_field_first;
+ int i_repeat_first_field;
+ int i_progressive_frame;
+
+ mtime_t i_interpolated_dts;
+ mtime_t i_last_ref_pts;
+ bool b_second_field;
+
+ /* Number of pictures since last sequence header */
+ int i_seq_old;
+
+ /* Sync behaviour */
+ bool b_sync_on_intra_frame;
+ bool b_discontinuity;
+
+ /* */
+ bool b_cc_reset;
+ uint32_t i_cc_flags;
+ mtime_t i_cc_pts;
+ mtime_t i_cc_dts;
+ cc_data_t cc;
+};
-static int Open ( vlc_object_t * );
-static int Run ( decoder_fifo_t * );
+static block_t *Packetize( decoder_t *, block_t ** );
+static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] );
-static int InitThread ( packetizer_t * );
-static void PacketizeThread ( packetizer_t * );
-static void EndThread ( packetizer_t * );
+static void PacketizeReset( void *p_private, bool b_broken );
+static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t * );
+static int PacketizeValidate( void *p_private, block_t * );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
+static block_t *ParseMPEGBlock( decoder_t *, block_t * );
-vlc_module_begin();
- set_description( _("MPEG-I/II video packetizer") );
- set_capability( "packetizer", 50 );
- set_callbacks( Open, NULL );
-vlc_module_end();
+static const uint8_t p_mp2v_startcode[3] = { 0x00, 0x00, 0x01 };
/*****************************************************************************
- * OpenDecoder: probe the packetizer and return score
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to choose.
+ * Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
- if( p_fifo->i_fourcc != VLC_FOURCC( 'm', 'p', 'g', 'v') &&
- p_fifo->i_fourcc != VLC_FOURCC( 'm', 'p', 'g', '1') &&
- p_fifo->i_fourcc != VLC_FOURCC( 'm', 'p', 'g', '2') )
- {
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_MPGV )
return VLC_EGENERIC;
- }
- p_fifo->pf_run = Run;
+ es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_CODEC_MPGV );
+ p_dec->fmt_out.i_original_fourcc = p_dec->fmt_in.i_original_fourcc;
+
+ p_dec->pf_packetize = Packetize;
+ p_dec->pf_get_cc = GetCc;
+
+ p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
+ if( !p_dec->p_sys )
+ return VLC_ENOMEM;
+ memset( p_dec->p_sys, 0, sizeof( decoder_sys_t ) );
+
+ /* Misc init */
+ packetizer_Init( &p_sys->packetizer,
+ p_mp2v_startcode, sizeof(p_mp2v_startcode),
+ NULL, 0, 4,
+ PacketizeReset, PacketizeParse, PacketizeValidate, p_dec );
+
+ 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 = false;
+
+ p_sys->i_dts = p_sys->i_pts = VLC_TS_INVALID;
+
+ p_sys->i_frame_rate = 1;
+ p_sys->i_frame_rate_base = 1;
+ p_sys->b_seq_progressive = true;
+ p_sys->b_low_delay = true;
+ p_sys->i_seq_old = 0;
+
+ p_sys->i_temporal_ref = 0;
+ p_sys->i_picture_type = 0;
+ p_sys->i_picture_structure = 0x03; /* frame */
+ 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 = VLC_TS_INVALID;
+ p_sys->i_last_ref_pts = VLC_TS_INVALID;
+ p_sys->b_second_field = 0;
+
+ p_sys->b_discontinuity = 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 on intra frame now" );
+
+ p_sys->b_cc_reset = false;
+ p_sys->i_cc_pts = 0;
+ p_sys->i_cc_dts = 0;
+ p_sys->i_cc_flags = 0;
+ cc_Init( &p_sys->cc );
+
return VLC_SUCCESS;
}
/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
+ * Close:
*****************************************************************************/
-static int Run( decoder_fifo_t *p_fifo )
+static void Close( vlc_object_t *p_this )
{
- packetizer_t *p_pack;
- int b_error;
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- msg_Info( p_fifo, "Running mpegvideo packetizer" );
- if( !( p_pack = malloc( sizeof( packetizer_t ) ) ) )
+ if( p_sys->p_seq )
{
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
+ block_Release( p_sys->p_seq );
}
- memset( p_pack, 0, sizeof( packetizer_t ) );
-
- p_pack->p_fifo = p_fifo;
-
- if( InitThread( p_pack ) != 0 )
+ if( p_sys->p_ext )
{
- DecoderError( p_fifo );
- return( -1 );
+ block_Release( p_sys->p_ext );
}
-
- while( ( !p_pack->p_fifo->b_die )&&( !p_pack->p_fifo->b_error ) )
+ if( p_sys->p_frame )
{
- PacketizeThread( p_pack );
+ block_ChainRelease( p_sys->p_frame );
}
+ packetizer_Clean( &p_sys->packetizer );
+ var_Destroy( p_dec, "packetizer-mpegvideo-sync-iframe" );
- if( ( b_error = p_pack->p_fifo->b_error ) )
- {
- DecoderError( p_pack->p_fifo );
- }
-
- EndThread( p_pack );
-
- if( p_pack )
- {
- free( p_pack );
- }
+ free( p_sys );
+}
- if( b_error )
- {
- return( -1 );
- }
+/*****************************************************************************
+ * Packetize:
+ *****************************************************************************/
+static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
- return( 0 );
+ return packetizer_Packetize( &p_sys->packetizer, pp_block );
}
-
/*****************************************************************************
- * InitThread: initialize data before entering main loop
+ * GetCc:
*****************************************************************************/
-
-static int InitThread( packetizer_t *p_pack )
+static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] )
{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_cc;
+ int i;
- p_pack->output_format.i_cat = VIDEO_ES;
- p_pack->output_format.i_fourcc = VLC_FOURCC( 'm', 'p', 'g', 'v');
- p_pack->output_format.i_width = 0;
- p_pack->output_format.i_height = 0;
- p_pack->output_format.i_bitrate= 0;
- p_pack->output_format.i_extra_data = 0;
- p_pack->output_format.p_extra_data = NULL;
+ for( i = 0; i < 4; i++ )
+ pb_present[i] = p_sys->cc.pb_present[i];
- p_pack->p_sout_input = NULL;
+ if( p_sys->cc.i_data <= 0 )
+ return NULL;
- if( InitBitstream( &p_pack->bit_stream, p_pack->p_fifo,
- NULL, NULL ) != VLC_SUCCESS )
+ p_cc = block_New( p_dec, p_sys->cc.i_data);
+ if( p_cc )
{
- msg_Err( p_pack->p_fifo, "cannot initialize bitstream" );
- return -1;
+ memcpy( p_cc->p_buffer, p_sys->cc.p_data, p_sys->cc.i_data );
+ p_cc->i_dts =
+ p_cc->i_pts = p_sys->cc.b_reorder ? p_sys->i_cc_pts : p_sys->i_cc_dts;
+ p_cc->i_flags = ( p_sys->cc.b_reorder ? p_sys->i_cc_flags : BLOCK_FLAG_TYPE_P ) & ( BLOCK_FLAG_TYPE_I|BLOCK_FLAG_TYPE_P|BLOCK_FLAG_TYPE_B);
}
+ cc_Flush( &p_sys->cc );
+ return p_cc;
+}
+
+/*****************************************************************************
+ * Helpers:
+ *****************************************************************************/
+static void PacketizeReset( void *p_private, bool b_broken )
+{
+ decoder_t *p_dec = p_private;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- return( 0 );
+ if( b_broken )
+ {
+ p_sys->b_discontinuity = 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 = false;
+ }
+ p_sys->i_dts =
+ p_sys->i_pts =
+ p_sys->i_interpolated_dts =
+ p_sys->i_last_ref_pts = VLC_TS_INVALID;
}
-/* from ISO 13818-2 */
-/* converting frame_rate_code to frame_rate */
-static const double pd_frame_rates[16] =
+static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t *p_block )
{
- 0, 24000.0/1001, 24, 25, 30000.0/1001, 30, 50, 60000.0/1001, 60,
- 0, 0, 0, 0, 0, 0, 0
-};
+ decoder_t *p_dec = p_private;
+
+ /* Check if we have a picture start code */
+ *pb_ts_used = p_block->p_buffer[3] == 0x00;
-static int CopyUntilNextStartCode( packetizer_t *p_pack,
- sout_buffer_t *p_sout_buffer,
- unsigned int *pi_pos )
+ return ParseMPEGBlock( p_dec, p_block );
+}
+
+
+static int PacketizeValidate( void *p_private, block_t *p_au )
{
- int i_copy = 0;
+ decoder_t *p_dec = p_private;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- do
+ /* 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 )
{
- p_sout_buffer->p_buffer[(*pi_pos)++] =
- GetBits( &p_pack->bit_stream, 8 );
- i_copy++;
-
- if( *pi_pos + 2048 > p_sout_buffer->i_buffer_size )
+ if( (p_au->i_flags & BLOCK_FLAG_TYPE_I) == 0 )
{
- sout_BufferRealloc( p_pack->p_sout_input->p_sout,
- p_sout_buffer,
- p_sout_buffer->i_buffer_size + 50 * 1024);
+ msg_Dbg( p_dec, "waiting on intra frame" );
+ return VLC_EGENERIC;
}
+ msg_Dbg( p_dec, "synced on intra frame" );
+ p_sys->b_discontinuity = false;
+ p_au->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+ }
- } while( ShowBits( &p_pack->bit_stream, 24 ) != 0x01 &&
- !p_pack->p_fifo->b_die && !p_pack->p_fifo->b_error );
+ /* 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 <= VLC_TS_INVALID && p_sys->i_pts <= VLC_TS_INVALID &&
+ p_sys->i_interpolated_dts <= VLC_TS_INVALID )
+ {
+ msg_Dbg( p_dec, "need a starting pts/dts" );
+ return VLC_EGENERIC;
+ }
- return( i_copy );
-}
+ /* When starting the stream we can have the first frame with
+ * an invalid DTS (i_interpolated_pts is initialized to VLC_TS_INVALID) */
+ if( p_au->i_dts <= VLC_TS_INVALID )
+ p_au->i_dts = p_au->i_pts;
+ return VLC_SUCCESS;
+}
/*****************************************************************************
- * PacketizeThread: packetize an unit (here copy a complete pes)
+ * ParseMPEGBlock: Re-assemble fragments into a block containing a picture
*****************************************************************************/
-static void PacketizeThread( packetizer_t *p_pack )
+static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
{
- sout_buffer_t *p_sout_buffer = NULL;
- vlc_bool_t b_seen_slice = VLC_FALSE;
- int32_t i_pos;
- int i_skipped;
- mtime_t i_duration; /* of the parsed picture */
-
- mtime_t i_pts = 0;
- mtime_t i_dts = 0;
-
- /* needed to calculate pts/dts */
- int i_temporal_ref = 0;
- int i_picture_coding_type = 0;
- int i_picture_structure = 0x03; /* frame picture */
- int i_top_field_first = 0;
- int i_repeat_first_field = 0;
- int i_progressive_frame = 0;
-
- if( !p_pack->p_sout_input )
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_pic = NULL;
+
+ /*
+ * Check if previous picture is finished
+ */
+ if( ( p_sys->b_frame_slice &&
+ (p_frag->p_buffer[3] == 0x00 || p_frag->p_buffer[3] > 0xaf) ) &&
+ p_sys->p_seq == NULL )
+ {
+ /* We have a picture but without a sequence header we can't
+ * do anything */
+ 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 = false;
+
+ }
+ else if( p_sys->b_frame_slice &&
+ (p_frag->p_buffer[3] == 0x00 || p_frag->p_buffer[3] > 0xaf) )
{
- byte_t p_temp[512];/* 150 bytes is the maximal size
- of a sequence_header + sequence_extension */
- int i_frame_rate_code;
+ const bool b_eos = p_frag->p_buffer[3] == 0xb7;
+ mtime_t i_duration;
- /* skip data until we find a sequence_header_code */
- /* TODO: store skipped somewhere so can send it to the mux
- * after the input is created */
- i_skipped = 0;
- while( ShowBits( &p_pack->bit_stream, 32 ) != 0x1B3 &&
- !p_pack->p_fifo->b_die && !p_pack->p_fifo->b_error )
+ if( b_eos )
{
- RemoveBits( &p_pack->bit_stream, 8 );
- i_skipped++;
+ block_ChainLastAppend( &p_sys->pp_last, p_frag );
+ p_frag = NULL;
}
- msg_Warn( p_pack->p_fifo, "sequence_header_code found (%d skipped)",
- i_skipped );
- /* copy the start_code */
- i_pos = 0;
- GetChunk( &p_pack->bit_stream, p_temp, 4 ); i_pos += 4;
+ p_pic = block_ChainGather( p_sys->p_frame );
- /* horizontal_size_value */
- p_pack->output_format.i_width = ShowBits( &p_pack->bit_stream, 12 );
- /* vertical_size_value */
- p_pack->output_format.i_height= ShowBits( &p_pack->bit_stream, 24 ) & 0xFFF;
- /* frame_rate_code */
- i_frame_rate_code = ShowBits( &p_pack->bit_stream, 32 ) & 0xF;
+ if( b_eos )
+ p_pic->i_flags |= BLOCK_FLAG_END_OF_SEQUENCE;
- /* copy headers */
- GetChunk( &p_pack->bit_stream, p_temp + i_pos, 7 ); i_pos += 7;
+ i_duration = (mtime_t)( 1000000 * p_sys->i_frame_rate_base /
+ p_sys->i_frame_rate );
- /* intra_quantiser_matrix [non_intra_quantiser_matrix] */
- if( ShowBits( &p_pack->bit_stream, 7 ) & 0x1 )
+ if( !p_sys->b_seq_progressive && p_sys->i_picture_structure != 0x03 )
{
+ i_duration /= 2;
+ }
- GetChunk( &p_pack->bit_stream, p_temp + i_pos, 64 ); i_pos += 64;
-
- if( ShowBits( &p_pack->bit_stream, 8 ) & 0x1 )
+ if( p_sys->b_seq_progressive )
+ {
+ if( p_sys->i_top_field_first == 0 &&
+ p_sys->i_repeat_first_field == 1 )
{
- GetChunk( &p_pack->bit_stream, p_temp + i_pos, 65); i_pos += 65;
+ i_duration *= 2;
+ }
+ else if( p_sys->i_top_field_first == 1 &&
+ p_sys->i_repeat_first_field == 1 )
+ {
+ i_duration *= 3;
}
}
- /* non_intra_quantiser_matrix */
- else if( ShowBits( &p_pack->bit_stream, 8 ) & 0x1 )
- {
- GetChunk( &p_pack->bit_stream, p_temp + i_pos, 65); i_pos += 65;
- }
- /* nothing */
else
{
- GetChunk( &p_pack->bit_stream, p_temp + i_pos, 1 ); i_pos += 1;
+ if( p_sys->i_picture_structure == 0x03 )
+ {
+ if( p_sys->i_progressive_frame && p_sys->i_repeat_first_field )
+ {
+ i_duration += i_duration / 2;
+ }
+ }
}
- /* sequence_extension (10 bytes) */
- if( ShowBits( &p_pack->bit_stream, 32 ) != 0x1B5 )
+ if( p_sys->b_low_delay || p_sys->i_picture_type == 0x03 )
{
- msg_Dbg( p_pack->p_fifo, "ARRGG no extension_start_code" );
- p_pack->i_progressive_sequence = 1;
- p_pack->i_low_delay = 1;
+ /* Trivial case (DTS == PTS) */
+ /* Correct interpolated dts when we receive a new pts/dts */
+ if( p_sys->i_pts > VLC_TS_INVALID )
+ p_sys->i_interpolated_dts = p_sys->i_pts;
+ if( p_sys->i_dts > VLC_TS_INVALID )
+ p_sys->i_interpolated_dts = p_sys->i_dts;
}
else
{
- GetChunk( &p_pack->bit_stream, p_temp + i_pos, 10 );
- p_pack->i_progressive_sequence = ( p_temp[i_pos+5]&0x08 ) ? 1 : 0;
- p_pack->i_low_delay = ( p_temp[i_pos+9]&0x80 ) ? 1 : 0;
- i_pos += 10;
+ /* Correct interpolated dts when we receive a new pts/dts */
+ if(p_sys->i_last_ref_pts > VLC_TS_INVALID && !p_sys->b_second_field)
+ p_sys->i_interpolated_dts = p_sys->i_last_ref_pts;
+ if( p_sys->i_dts > VLC_TS_INVALID )
+ p_sys->i_interpolated_dts = p_sys->i_dts;
+
+ if( !p_sys->b_second_field )
+ p_sys->i_last_ref_pts = p_sys->i_pts;
}
- /* remember sequence_header and sequence_extention */
- memcpy( p_pack->p_sequence_header, p_temp, i_pos );
- p_pack->i_sequence_header_length = i_pos;
-
- p_pack->d_frame_rate = pd_frame_rates[i_frame_rate_code];
+ p_pic->i_dts = p_sys->i_interpolated_dts;
+ p_sys->i_interpolated_dts += i_duration;
- msg_Warn( p_pack->p_fifo,
- "creating input (image size %dx%d, frame rate %.2f)",
- p_pack->output_format.i_width,
- p_pack->output_format.i_height,
- p_pack->d_frame_rate );
-
- /* now we have informations to create the input */
- p_pack->p_sout_input = sout_InputNew( p_pack->p_fifo,
- &p_pack->output_format );
-
- if( !p_pack->p_sout_input )
+ /* Set PTS only if we have a B frame or if it comes from the stream */
+ if( p_sys->i_pts > VLC_TS_INVALID )
{
- msg_Err( p_pack->p_fifo, "cannot add a new stream" );
- p_pack->p_fifo->b_error = VLC_TRUE;
- return;
+ p_pic->i_pts = p_sys->i_pts;
}
-
- p_sout_buffer = sout_BufferNew( p_pack->p_sout_input->p_sout,
- 100 * 1024 );
- p_sout_buffer->i_size = i_pos;
- memcpy( p_sout_buffer->p_buffer, p_temp, i_pos );
-
- }
- else
- {
- p_sout_buffer =
- sout_BufferNew( p_pack->p_sout_input->p_sout, 100 * 1024 );
- i_pos = 0;
- }
-
- p_pack->i_last_sequence_header++;
-
- for( ;; )
- {
- uint32_t i_code;
- if( p_pack->p_fifo->b_die || p_pack->p_fifo->b_error )
+ else if( p_sys->i_picture_type == 0x03 )
{
- break;
+ p_pic->i_pts = p_pic->i_dts;
}
-
- i_code = ShowBits( &p_pack->bit_stream, 32 );
-
- if( b_seen_slice && ( i_code < 0x101 || i_code > 0x1af ) )
+ else
{
- break;
+ p_pic->i_pts = VLC_TS_INVALID;
}
- if( i_code == 0x1B8 ) /* GOP */
+ switch ( p_sys->i_picture_type )
{
- /* usefull for bad MPEG-1 : repeat the sequence_header
- every second */
- if( p_pack->i_last_sequence_header > (int) p_pack->d_frame_rate )
- {
- memcpy( p_sout_buffer->p_buffer + i_pos,
- p_pack->p_sequence_header,
- p_pack->i_sequence_header_length );
- i_pos += p_pack->i_sequence_header_length;
- p_pack->i_last_sequence_header = 0;
- }
- CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos );
+ 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;
}
- else if( i_code == 0x100 ) /* Picture */
- {
- /* picture_start_code */
- GetChunk( &p_pack->bit_stream,
- p_sout_buffer->p_buffer + i_pos, 4 ); i_pos += 4;
- NextPTS( &p_pack->bit_stream, &i_pts, &i_dts );
- i_temporal_ref = ShowBits( &p_pack->bit_stream, 10 );
- i_picture_coding_type = ShowBits( &p_pack->bit_stream, 13 ) & 0x3;
+ p_pic->i_length = p_sys->i_interpolated_dts - p_pic->i_dts;
- CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos );
- }
- else if( i_code == 0x1b5 )
- {
- /* extention start code 32 */
- GetChunk( &p_pack->bit_stream,
- p_sout_buffer->p_buffer + i_pos, 4 ); i_pos += 4;
+#if 0
+ msg_Dbg( p_dec, "pic: type=%d dts=%"PRId64" pts-dts=%"PRId64,
+ p_sys->i_picture_type, p_pic->i_dts, p_pic->i_pts - p_pic->i_dts);
+#endif
- if( ShowBits( &p_pack->bit_stream, 4 ) == 0x08 )
- {
- /* picture coding extention */
-
- /* extention start code identifier(b1000) 4 */
- /* f_code[2][2] 16 */
- /* intra_dc_precision 2 */
- /* picture_structure 2 */
- /* top_field_first 1 */
- i_picture_structure =
- ShowBits( &p_pack->bit_stream, 24 ) & 0x03;
- i_top_field_first =
- ShowBits( &p_pack->bit_stream, 25 ) & 0x01;
- i_repeat_first_field =
- ShowBits( &p_pack->bit_stream, 31 ) & 0x01;
-
- GetChunk( &p_pack->bit_stream,
- p_sout_buffer->p_buffer + i_pos, 4 ); i_pos += 4;
-
- i_progressive_frame =
- ShowBits( &p_pack->bit_stream, 1 ) & 0x01;
- }
- CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos );
+ /* Reset context */
+ p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
+ p_sys->b_frame_slice = false;
+
+ if( p_sys->i_picture_structure != 0x03 )
+ {
+ p_sys->b_second_field = !p_sys->b_second_field;
}
else
{
- if( i_code >= 0x101 && i_code <= 0x1af )
- {
- b_seen_slice = VLC_TRUE;
- }
-
- if( i_code == 0x1B3 )
- {
- p_pack->i_last_sequence_header = 0;
- }
- CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos );
+ p_sys->b_second_field = 0;
}
- }
- if( i_pts <= 0 && i_dts <= 0 && p_pack->i_interpolated_dts <= 0 )
- {
- msg_Dbg( p_pack->p_fifo, "need a starting pts/dts" );
- sout_BufferDelete( p_pack->p_sout_input->p_sout, p_sout_buffer );
- return;
+ /* CC */
+ p_sys->b_cc_reset = true;
+ p_sys->i_cc_pts = p_pic->i_pts;
+ p_sys->i_cc_dts = p_pic->i_dts;
+ p_sys->i_cc_flags = p_pic->i_flags;
}
- sout_BufferRealloc( p_pack->p_sout_input->p_sout,
- p_sout_buffer, i_pos );
- p_sout_buffer->i_size = i_pos;
-
- /* calculate frame duration */
- if( p_pack->i_progressive_sequence || i_picture_structure == 0x03)
+ if( !p_pic && p_sys->b_cc_reset )
{
- i_duration = (mtime_t)( 1000000 / p_pack->d_frame_rate );
- }
- else
- {
- i_duration = (mtime_t)( 1000000 / p_pack->d_frame_rate / 2);
+ p_sys->b_cc_reset = false;
+ cc_Flush( &p_sys->cc );
}
- if( p_pack->i_progressive_sequence )
+ if( !p_frag )
+ return p_pic;
+ /*
+ * Check info of current fragment
+ */
+ if( p_frag->p_buffer[3] == 0xb8 )
{
- if( i_top_field_first == 0 && i_repeat_first_field == 1 )
+ /* Group start code */
+ if( p_sys->p_seq &&
+ p_sys->i_seq_old > p_sys->i_frame_rate/p_sys->i_frame_rate_base )
{
- i_duration = 2 * i_duration;
+ /* Useful for mpeg1: repeat sequence header every second */
+ block_ChainLastAppend( &p_sys->pp_last, block_Duplicate( p_sys->p_seq ) );
+ if( p_sys->p_ext )
+ {
+ block_ChainLastAppend( &p_sys->pp_last, block_Duplicate( p_sys->p_ext ) );
+ }
+
+ p_sys->i_seq_old = 0;
}
- else if( i_top_field_first == 1 && i_repeat_first_field == 1 )
+ }
+ else if( p_frag->p_buffer[3] == 0xb3 && p_frag->i_buffer >= 8 )
+ {
+ /* Sequence header code */
+ static const int code_to_frame_rate[16][2] =
{
- i_duration = 3 * i_duration;
+ { 1, 1 }, /* invalid */
+ { 24000, 1001 }, { 24, 1 }, { 25, 1 }, { 30000, 1001 },
+ { 30, 1 }, { 50, 1 }, { 60000, 1001 }, { 60, 1 },
+ /* Unofficial 15fps from Xing*/
+ { 15, 1001 },
+ /* Unofficial economy rates from libmpeg3 */
+ { 5, 1001 }, { 10, 1001 }, { 12, 1001 }, { 15, 1001 },
+ { 1, 1 }, { 1, 1 } /* invalid */
+ };
+
+ if( p_sys->p_seq ) block_Release( p_sys->p_seq );
+ if( p_sys->p_ext ) block_Release( p_sys->p_ext );
+
+ p_sys->p_seq = block_Duplicate( p_frag );
+ p_sys->i_seq_old = 0;
+ p_sys->p_ext = NULL;
+
+ p_dec->fmt_out.video.i_width =
+ ( p_frag->p_buffer[4] << 4)|(p_frag->p_buffer[5] >> 4 );
+ p_dec->fmt_out.video.i_height =
+ ( (p_frag->p_buffer[5]&0x0f) << 8 )|p_frag->p_buffer[6];
+ p_sys->i_aspect_ratio_info = p_frag->p_buffer[7] >> 4;
+
+ /* TODO: MPEG1 aspect ratio */
+
+ p_sys->i_frame_rate = code_to_frame_rate[p_frag->p_buffer[7]&0x0f][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 = true;
+ p_sys->b_low_delay = true;
+
+ 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 );
+ p_sys->b_inited = 1;
}
}
- else
+ else if( p_frag->p_buffer[3] == 0xb5 )
{
- if( i_picture_structure == 0x03 )
+ int i_type = p_frag->p_buffer[4] >> 4;
+
+ /* Extension start code */
+ if( i_type == 0x01 )
{
- if( i_progressive_frame && i_repeat_first_field )
+#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 extension */
+ if( p_sys->p_ext) block_Release( p_sys->p_ext );
+ p_sys->p_ext = block_Duplicate( p_frag );
+
+ if( p_frag->i_buffer >= 10 )
{
- i_duration += i_duration / 2;
+ p_sys->b_seq_progressive =
+ p_frag->p_buffer[5]&0x08 ? true : false;
+ p_sys->b_low_delay =
+ p_frag->p_buffer[9]&0x80 ? true : 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_sar_num =
+ mpeg2_aspect[p_sys->i_aspect_ratio_info][0] *
+ p_dec->fmt_out.video.i_height;
+ p_dec->fmt_out.video.i_sar_den =
+ mpeg2_aspect[p_sys->i_aspect_ratio_info][1] *
+ p_dec->fmt_out.video.i_width;
+#endif
+
+ }
+ else if( i_type == 0x08 )
+ {
+ /* picture extension */
+ p_sys->i_picture_structure = p_frag->p_buffer[6]&0x03;
+ p_sys->i_top_field_first = p_frag->p_buffer[7] >> 7;
+ p_sys->i_repeat_first_field= (p_frag->p_buffer[7]>>1)&0x01;
+ p_sys->i_progressive_frame = p_frag->p_buffer[8] >> 7;
}
}
-
- if( p_pack->i_low_delay || i_picture_coding_type == 0x03 )
+ else if( p_frag->p_buffer[3] == 0xb2 && p_frag->i_buffer > 4 )
{
- /* Trivial case (DTS == PTS) */
- /* Correct interpolated dts when we receive a new pts/dts */
- if( i_pts > 0 ) p_pack->i_interpolated_dts = i_pts;
- if( i_dts > 0 ) p_pack->i_interpolated_dts = i_dts;
+ cc_Extract( &p_sys->cc, p_sys->i_top_field_first,
+ &p_frag->p_buffer[4], p_frag->i_buffer - 4 );
}
- else
+ else if( p_frag->p_buffer[3] == 0x00 )
{
- /* Correct interpolated dts when we receive a new pts/dts */
- if( p_pack->i_last_ref_pts )
- p_pack->i_interpolated_dts = p_pack->i_last_ref_pts;
- if( i_dts > 0 ) p_pack->i_interpolated_dts = i_dts;
-
- p_pack->i_last_ref_pts = i_pts;
- }
+ /* Picture start code */
+ p_sys->i_seq_old++;
- /* Don't even try to calculate the PTS unless it is given in the
- * original stream */
- p_sout_buffer->i_pts = i_pts ? i_pts : -1;
-
- p_sout_buffer->i_dts = p_pack->i_interpolated_dts;
+ if( p_frag->i_buffer >= 6 )
+ {
+ p_sys->i_temporal_ref =
+ ( p_frag->p_buffer[4] << 2 )|(p_frag->p_buffer[5] >> 6);
+ p_sys->i_picture_type = ( p_frag->p_buffer[5] >> 3 ) & 0x03;
+ }
- if( p_pack->i_low_delay || i_picture_coding_type == 0x03 )
- {
- /* Trivial case (DTS == PTS) */
- p_pack->i_interpolated_dts += i_duration;
+ p_sys->i_dts = p_frag->i_dts;
+ p_sys->i_pts = p_frag->i_pts;
}
- else
+ else if( p_frag->p_buffer[3] >= 0x01 && p_frag->p_buffer[3] <= 0xaf )
{
- p_pack->i_interpolated_dts += p_pack->i_old_duration;
- p_pack->i_old_duration = i_duration;
+ /* Slice start code */
+ p_sys->b_frame_slice = true;
}
- p_sout_buffer->i_bitrate = (int)( 8 * i_pos * p_pack->d_frame_rate );
- p_sout_buffer->i_length = i_duration;
+ /* Append the block */
+ block_ChainLastAppend( &p_sys->pp_last, p_frag );
- sout_InputSendBuffer( p_pack->p_sout_input, p_sout_buffer );
-}
-
-
-/*****************************************************************************
- * EndThread : packetizer thread destruction
- *****************************************************************************/
-static void EndThread ( packetizer_t *p_pack)
-{
- if( p_pack->p_sout_input )
- {
- sout_InputDelete( p_pack->p_sout_input );
- }
+ return p_pic;
}