/*****************************************************************************
- * mpeg4video.c:
+ * mpeg4video.c: mpeg 4 video packetizer
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpeg4video.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $
+ * Copyright (C) 2001-2006 the VideoLAN team
+ * $Id$
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
+ * Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
*
* 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/aout.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-#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_sout.h>
+#include <vlc_codec.h>
+#include <vlc_block.h>
+
+#include <vlc_bits.h>
+#include <vlc_block_helper.h>
+#include "packetizer_helper.h"
/*****************************************************************************
- * Local prototypes
+ * Module descriptor
*****************************************************************************/
-typedef struct packetizer_thread_s
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+vlc_module_begin ()
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_PACKETIZER )
+ set_description( N_("MPEG4 video packetizer") )
+ set_capability( "packetizer", 50 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
+
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+struct decoder_sys_t
{
- /* Input properties */
- decoder_fifo_t *p_fifo;
- bit_stream_t bit_stream;
+ /*
+ * Input properties
+ */
+ packetizer_t packetizer;
- mtime_t i_dts;
+ /*
+ * Common properties
+ */
+ mtime_t i_interpolated_pts;
+ mtime_t i_interpolated_dts;
+ mtime_t i_last_ref_pts;
+ mtime_t i_last_time_ref;
+ mtime_t i_time_ref;
+ mtime_t i_last_time;
+ mtime_t i_last_timeincr;
- /* Output properties */
- sout_input_t *p_sout_input;
- sout_packet_format_t output_format;
+ unsigned int i_flags;
+ int i_fps_num;
+ int i_fps_den;
+ int i_last_incr;
+ int i_last_incr_diff;
- sout_buffer_t *p_vol;
- int i_vop_since_vol;
-} packetizer_thread_t;
+ bool b_frame;
-static int Open ( vlc_object_t * );
-static int Run ( decoder_fifo_t * );
+ /* Current frame being built */
+ block_t *p_frame;
+ block_t **pp_last;
+};
-static int InitThread ( packetizer_thread_t * );
-static void PacketizeThread ( packetizer_thread_t * );
-static void EndThread ( packetizer_thread_t * );
+static block_t *Packetize( decoder_t *, block_t ** );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
+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 * );
-vlc_module_begin();
- set_description( _("MPEG-4 packetizer") );
- set_capability( "packetizer", 50 );
- set_callbacks( Open, NULL );
-vlc_module_end();
+static block_t *ParseMPEGBlock( decoder_t *, block_t * );
+static int ParseVOL( decoder_t *, es_format_t *, uint8_t *, int );
+static int ParseVOP( decoder_t *, block_t * );
+static int vlc_log2( unsigned int );
#define VIDEO_OBJECT_MASK 0x01f
#define VIDEO_OBJECT_LAYER_MASK 0x00f
#define TEXTURE_SPATIAL_LAYER_START_CODE 0x1bf
#define TEXTURE_SNR_LAYER_START_CODE 0x1c0
+static const uint8_t p_mp4v_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: probe the packetizer and return score
*****************************************************************************/
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_dec->fmt_in.i_codec != VLC_CODEC_MP4V )
+ return VLC_EGENERIC;
+
+ /* Allocate the memory needed to store the decoder's structure */
+ if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL )
+ return VLC_ENOMEM;
+ memset( p_sys, 0, sizeof(decoder_sys_t) );
+
+ /* Misc init */
+ packetizer_Init( &p_sys->packetizer,
+ p_mp4v_startcode, sizeof(p_mp4v_startcode),
+ NULL, 0, 4,
+ PacketizeReset, PacketizeParse, PacketizeValidate, p_dec );
- p_fifo->pf_run = Run;
+ p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
- switch( p_fifo->i_fourcc )
+ /* Setup properties */
+ es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
+ p_dec->fmt_out.i_codec = VLC_CODEC_MP4V;
+
+ free(p_dec->fmt_out.p_extra);
+
+ if( p_dec->fmt_in.i_extra )
+ {
+ /* We have a vol */
+ p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra;
+ p_dec->fmt_out.p_extra = xmalloc( p_dec->fmt_in.i_extra );
+ memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra,
+ p_dec->fmt_in.i_extra );
+
+ msg_Dbg( p_dec, "opening with vol size: %d", p_dec->fmt_in.i_extra );
+ ParseVOL( p_dec, &p_dec->fmt_out,
+ p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
+ }
+ else
{
- case VLC_FOURCC( 'm', 'p', '4', 'v'):
- case VLC_FOURCC( 'D', 'I', 'V', 'X'):
- case VLC_FOURCC( 'd', 'i', 'v', 'x'):
- case VLC_FOURCC( 'X', 'V', 'I', 'D'):
- case VLC_FOURCC( 'X', 'v', 'i', 'D'):
- case VLC_FOURCC( 'x', 'v', 'i', 'd'):
- case VLC_FOURCC( 'D', 'X', '5', '0'):
- return VLC_SUCCESS;
- default:
- return VLC_EGENERIC;
+ /* No vol, we'll have to look for one later on */
+ p_dec->fmt_out.i_extra = 0;
+ p_dec->fmt_out.p_extra = 0;
}
+
+ /* Set callback */
+ p_dec->pf_packetize = Packetize;
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
+ * Close: clean up the packetizer
*****************************************************************************/
-static int Run( decoder_fifo_t *p_fifo )
+static void Close( vlc_object_t *p_this )
{
- packetizer_thread_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 MPEG-4 packetizer" );
- if( !( p_pack = malloc( sizeof( packetizer_thread_t ) ) ) )
- {
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
- }
- memset( p_pack, 0, sizeof( packetizer_thread_t ) );
-
- p_pack->p_fifo = p_fifo;
+ packetizer_Clean( &p_sys->packetizer );
+ if( p_sys->p_frame )
+ block_ChainRelease( p_sys->p_frame );
+ free( p_sys );
+}
- if( InitThread( p_pack ) != 0 )
- {
- DecoderError( p_fifo );
- return( -1 );
- }
+/****************************************************************************
+ * Packetize: the whole thing
+ ****************************************************************************/
+static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
- while( ( !p_pack->p_fifo->b_die )&&( !p_pack->p_fifo->b_error ) )
- {
- PacketizeThread( p_pack );
- }
+ return packetizer_Packetize( &p_sys->packetizer, pp_block );
+}
+/*****************************************************************************
+ * 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;
- if( ( b_error = p_pack->p_fifo->b_error ) )
+ if( b_broken )
{
- DecoderError( p_pack->p_fifo );
+ if( p_sys->p_frame )
+ block_ChainRelease( p_sys->p_frame );
+ p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
}
- EndThread( p_pack );
- if( b_error )
- {
- return( -1 );
- }
+ p_sys->i_interpolated_pts =
+ p_sys->i_interpolated_dts =
+ p_sys->i_last_ref_pts = VLC_TS_INVALID;
- return( 0 );
+ p_sys->i_last_time_ref =
+ p_sys->i_time_ref =
+ p_sys->i_last_time =
+ p_sys->i_last_timeincr = 0;
}
+static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t *p_block )
+{
+ decoder_t *p_dec = p_private;
+ const mtime_t i_dts = p_block->i_dts;
+ const mtime_t i_pts = p_block->i_pts;
+
+ block_t *p_au = ParseMPEGBlock( p_dec, p_block );
-#define FREE( p ) if( p ) free( p ); p = NULL
+ *pb_ts_used = p_au && p_au->i_dts == i_dts && p_au->i_pts == i_pts;
-static int CopyUntilNextStartCode( packetizer_thread_t *p_pack,
- sout_buffer_t *p_sout_buffer,
- int *pi_pos )
+ return p_au;
+}
+
+
+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
+ /* 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_interpolated_pts <= VLC_TS_INVALID &&
+ p_sys->i_interpolated_dts <= VLC_TS_INVALID )
{
- p_sout_buffer->p_buffer[(*pi_pos)++] =
- GetBits( &p_pack->bit_stream, 8 );
- i_copy++;
+ msg_Dbg( p_dec, "need a starting pts/dts" );
+ return VLC_EGENERIC;
+ }
- if( *pi_pos + 2048 > p_sout_buffer->i_allocated_size )
+ /* When starting the stream we can have the first frame with
+ * a null DTS (i_interpolated_pts is initialized to 0) */
+ if( !p_au->i_dts )
+ p_au->i_dts = p_au->i_pts;
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * ParseMPEGBlock: Re-assemble fragments into a block containing a picture
+ *****************************************************************************/
+static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_pic = NULL;
+
+ if( p_frag->p_buffer[3] == 0xB0 || p_frag->p_buffer[3] == 0xB1 || p_frag->p_buffer[3] == 0xB2 )
+ { /* VOS and USERDATA */
+#if 0
+ /* Remove VOS start/end code from the original stream */
+ block_Release( p_frag );
+#else
+ /* Append the block for now since ts/ps muxers rely on VOL
+ * being present in the stream */
+ block_ChainLastAppend( &p_sys->pp_last, p_frag );
+#endif
+ return NULL;
+ }
+ if( p_frag->p_buffer[3] >= 0x20 && p_frag->p_buffer[3] <= 0x2f )
+ {
+ /* Copy the complete VOL */
+ if( (size_t)p_dec->fmt_out.i_extra != p_frag->i_buffer )
+ {
+ p_dec->fmt_out.p_extra =
+ xrealloc( p_dec->fmt_out.p_extra, p_frag->i_buffer );
+ p_dec->fmt_out.i_extra = p_frag->i_buffer;
+ }
+ memcpy( p_dec->fmt_out.p_extra, p_frag->p_buffer, p_frag->i_buffer );
+ ParseVOL( p_dec, &p_dec->fmt_out,
+ p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
+
+#if 0
+ /* Remove from the original stream */
+ block_Release( p_frag );
+#else
+ /* Append the block for now since ts/ps muxers rely on VOL
+ * being present in the stream */
+ block_ChainLastAppend( &p_sys->pp_last, p_frag );
+#endif
+ return NULL;
+ }
+ else
+ {
+ if( !p_dec->fmt_out.i_extra )
{
- sout_BufferRealloc( p_pack->p_sout_input->p_sout,
- p_sout_buffer,
- p_sout_buffer->i_allocated_size + 50 * 1024);
+ msg_Warn( p_dec, "waiting for VOL" );
+ block_Release( p_frag );
+ return NULL;
}
- } while( ShowBits( &p_pack->bit_stream, 24 ) != 0x01 &&
- !p_pack->p_fifo->b_die && !p_pack->p_fifo->b_error );
+ /* Append the block */
+ block_ChainLastAppend( &p_sys->pp_last, p_frag );
+ }
+
+ if( p_frag->p_buffer[3] == 0xb6 &&
+ ParseVOP( p_dec, p_frag ) == VLC_SUCCESS )
+ {
+ /* We are dealing with a VOP */
+ p_pic = block_ChainGather( p_sys->p_frame );
+ p_pic->i_flags = p_sys->i_flags;
+ p_pic->i_pts = p_sys->i_interpolated_pts;
+ p_pic->i_dts = p_sys->i_interpolated_dts;
+
+ /* Reset context */
+ p_sys->p_frame = NULL;
+ p_sys->pp_last = &p_sys->p_frame;
+ }
- return( i_copy );
+ return p_pic;
}
-static int sout_BufferAddMem( sout_instance_t *p_sout,
- sout_buffer_t *p_buffer,
- int i_mem,
- uint8_t *p_mem )
+/* ParseVOL:
+ * TODO:
+ * - support aspect ratio
+ */
+static int ParseVOL( decoder_t *p_dec, es_format_t *fmt,
+ uint8_t *p_vol, int i_vol )
{
- if( p_buffer->i_size + i_mem >= p_buffer->i_allocated_size )
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ int i_vo_type, i_vo_ver_id, i_ar, i_shape;
+ bs_t s;
+
+ for( ;; )
{
- sout_BufferRealloc( p_sout,
- p_buffer,
- p_buffer->i_size + i_mem + 1024 );
+ if( p_vol[0] == 0x00 && p_vol[1] == 0x00 && p_vol[2] == 0x01 &&
+ p_vol[3] >= 0x20 && p_vol[3] <= 0x2f ) break;
+
+ p_vol++; i_vol--;
+ if( i_vol <= 4 ) return VLC_EGENERIC;
}
- memcpy( p_buffer->p_buffer + p_buffer->i_size, p_mem, i_mem );
- p_buffer->i_size += i_mem;
- return( i_mem );
-}
+ bs_init( &s, &p_vol[4], i_vol - 4 );
-/*****************************************************************************
- * InitThread: initialize data before entering main loop
- *****************************************************************************/
+ bs_skip( &s, 1 ); /* random access */
+ i_vo_type = bs_read( &s, 8 );
+ if( bs_read1( &s ) )
+ {
+ i_vo_ver_id = bs_read( &s, 4 );
+ bs_skip( &s, 3 );
+ }
+ else
+ {
+ i_vo_ver_id = 1;
+ }
+ i_ar = bs_read( &s, 4 );
+ if( i_ar == 0xf )
+ {
+ int i_ar_width, i_ar_height;
-static int InitThread( packetizer_thread_t *p_pack )
-{
- p_pack->i_dts = 0;
- p_pack->p_vol = NULL;
- p_pack->i_vop_since_vol = 0;
- p_pack->output_format.i_cat = VIDEO_ES;
- p_pack->output_format.i_fourcc = VLC_FOURCC( 'm', 'p', '4', 'v' );
-
- if( InitBitstream( &p_pack->bit_stream, p_pack->p_fifo,
- NULL, NULL ) != VLC_SUCCESS )
+ i_ar_width = bs_read( &s, 8 );
+ i_ar_height= bs_read( &s, 8 );
+ }
+ if( bs_read1( &s ) )
+ {
+ int i_chroma_format;
+ int i_low_delay;
+
+ /* vol control parameter */
+ i_chroma_format = bs_read( &s, 2 );
+ i_low_delay = bs_read1( &s );
+
+ if( bs_read1( &s ) )
+ {
+ bs_skip( &s, 16 );
+ bs_skip( &s, 16 );
+ bs_skip( &s, 16 );
+ bs_skip( &s, 3 );
+ bs_skip( &s, 11 );
+ bs_skip( &s, 1 );
+ bs_skip( &s, 16 );
+ }
+ }
+ /* shape 0->RECT, 1->BIN, 2->BIN_ONLY, 3->GRAY */
+ i_shape = bs_read( &s, 2 );
+ if( i_shape == 3 && i_vo_ver_id != 1 )
{
- msg_Err( p_pack->p_fifo, "cannot initialize bitstream" );
- return -1;
+ bs_skip( &s, 4 );
}
- p_pack->p_sout_input =
- sout_InputNew( p_pack->p_fifo,
- &p_pack->output_format );
+ if( !bs_read1( &s ) ) return VLC_EGENERIC; /* Marker */
+
+ p_sys->i_fps_num = bs_read( &s, 16 ); /* Time increment resolution*/
+ if( !p_sys->i_fps_num ) p_sys->i_fps_num = 1;
+
+ if( !bs_read1( &s ) ) return VLC_EGENERIC; /* Marker */
+
+ if( bs_read1( &s ) )
+ {
+ int i_time_increment_bits = vlc_log2( p_sys->i_fps_num - 1 ) + 1;
+
+ if( i_time_increment_bits < 1 ) i_time_increment_bits = 1;
- if( !p_pack->p_sout_input )
+ p_sys->i_fps_den = bs_read( &s, i_time_increment_bits );
+ }
+ if( i_shape == 0 )
{
- msg_Err( p_pack->p_fifo,
- "cannot add a new stream" );
- return( -1 );
+ bs_skip( &s, 1 );
+ fmt->video.i_width = bs_read( &s, 13 );
+ bs_skip( &s, 1 );
+ fmt->video.i_height= bs_read( &s, 13 );
+ bs_skip( &s, 1 );
}
- return( 0 );
+ return VLC_SUCCESS;
}
-/*****************************************************************************
- * PacketizeThread: packetize an unit (here copy a complete pes)
- *****************************************************************************/
-static void PacketizeThread( packetizer_thread_t *p_pack )
+static int ParseVOP( decoder_t *p_dec, block_t *p_vop )
{
- sout_instance_t *p_sout = p_pack->p_sout_input->p_sout;
- sout_buffer_t *p_frame;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ int64_t i_time_increment, i_time_ref;
+ int i_modulo_time_base = 0, i_time_increment_bits;
+ bs_t s;
- uint32_t i_startcode;
+ bs_init( &s, &p_vop->p_buffer[4], p_vop->i_buffer - 4 );
- /* Idea: Copy until a vop has been found
- * Once a videoobject & videoobjectlayer has been found we save it
- */
+ switch( bs_read( &s, 2 ) )
+ {
+ case 0:
+ p_sys->i_flags = BLOCK_FLAG_TYPE_I;
+ break;
+ case 1:
+ p_sys->i_flags = BLOCK_FLAG_TYPE_P;
+ break;
+ case 2:
+ p_sys->i_flags = BLOCK_FLAG_TYPE_B;
+ p_sys->b_frame = true;
+ break;
+ case 3: /* gni ? */
+ p_sys->i_flags = BLOCK_FLAG_TYPE_PB;
+ break;
+ }
- p_frame = sout_BufferNew( p_sout, 20*1024 ); // FIXME
- p_frame->i_size = 0;
+ while( bs_read( &s, 1 ) ) i_modulo_time_base++;
+ if( !bs_read1( &s ) ) return VLC_EGENERIC; /* Marker */
- for( ;; )
+ /* VOP time increment */
+ i_time_increment_bits = vlc_log2(p_dec->p_sys->i_fps_num - 1) + 1;
+ if( i_time_increment_bits < 1 ) i_time_increment_bits = 1;
+ i_time_increment = bs_read( &s, i_time_increment_bits );
+
+ /* Interpolate PTS/DTS */
+ if( !(p_sys->i_flags & BLOCK_FLAG_TYPE_B) )
{
- while( ( ( i_startcode = ShowBits( &p_pack->bit_stream, 32 ) )&0xffffff00 ) != 0x00000100 )
- {
- RemoveBits( &p_pack->bit_stream, 8 );
- }
+ p_sys->i_last_time_ref = p_sys->i_time_ref;
+ p_sys->i_time_ref +=
+ (i_modulo_time_base * p_dec->p_sys->i_fps_num);
+ i_time_ref = p_sys->i_time_ref;
+ }
+ else
+ {
+ i_time_ref = p_sys->i_last_time_ref +
+ (i_modulo_time_base * p_dec->p_sys->i_fps_num);
+ }
- if( i_startcode == VISUAL_OBJECT_SEQUENCE_START_CODE )
- {
- msg_Dbg( p_pack->p_fifo, "<visuel_object_sequence>" );
- RemoveBits32( &p_pack->bit_stream );
- }
- else if( i_startcode == VISUAL_OBJECT_SEQUENCE_END_CODE )
- {
- msg_Dbg( p_pack->p_fifo, "</visuel_object_sequence>" );
- RemoveBits32( &p_pack->bit_stream );
- }
- else
- {
- msg_Dbg( p_pack->p_fifo, "start code:0x%8.8x", i_startcode );
-
- if( ( i_startcode & ~VIDEO_OBJECT_MASK ) == VIDEO_OBJECT_START_CODE )
- {
- msg_Dbg( p_pack->p_fifo, "<video_object>" );
- CopyUntilNextStartCode( p_pack, p_frame, &p_frame->i_size );
- }
- else if( ( i_startcode & ~VIDEO_OBJECT_LAYER_MASK ) == VIDEO_OBJECT_LAYER_START_CODE )
- {
- /* first: save it */
- if( p_pack->p_vol == NULL )
- {
- p_pack->p_vol = sout_BufferNew( p_sout, 1024 );
- }
- p_pack->p_vol->i_size = 0;
- CopyUntilNextStartCode( p_pack, p_pack->p_vol, &p_pack->p_vol->i_size );
- p_pack->i_vop_since_vol = 0;
-
- /* then: add it to p_frame */
- sout_BufferAddMem( p_sout, p_frame,
- p_pack->p_vol->i_size,
- p_pack->p_vol->p_buffer );
- }
- else if( i_startcode == GROUP_OF_VOP_START_CODE )
- {
- msg_Dbg( p_pack->p_fifo, "<group_of_vop>" );
- if( p_pack->p_vol && p_pack->i_vop_since_vol > 100 ) // FIXME
- {
- sout_BufferAddMem( p_sout, p_frame,
- p_pack->p_vol->i_size,
- p_pack->p_vol->p_buffer );
- p_pack->i_vop_since_vol = 0;
- }
- CopyUntilNextStartCode( p_pack, p_frame, &p_frame->i_size );
- }
- else if( i_startcode == VOP_START_CODE )
- {
- msg_Dbg( p_pack->p_fifo, "<vop>" );
- if( p_pack->p_vol && p_pack->i_vop_since_vol > 100 ) // FIXME
- {
- sout_BufferAddMem( p_sout, p_frame,
- p_pack->p_vol->i_size,
- p_pack->p_vol->p_buffer );
- p_pack->i_vop_since_vol = 0;
- }
- CopyUntilNextStartCode( p_pack, p_frame, &p_frame->i_size );
- p_pack->i_vop_since_vol++;
- break;
- }
- else
- {
- msg_Dbg( p_pack->p_fifo, "unknown start code" );
- CopyUntilNextStartCode( p_pack, p_frame, &p_frame->i_size );
- }
+#if 0
+ msg_Err( p_dec, "interp pts/dts (%lli,%lli), pts/dts (%lli,%lli)",
+ p_sys->i_interpolated_pts, p_sys->i_interpolated_dts,
+ p_vop->i_pts, p_vop->i_dts );
+#endif
- }
+ if( p_dec->p_sys->i_fps_num < 5 && /* Work-around buggy streams */
+ p_dec->fmt_in.video.i_frame_rate > 0 &&
+ p_dec->fmt_in.video.i_frame_rate_base > 0 )
+ {
+ p_sys->i_interpolated_pts += INT64_C(1000000) *
+ p_dec->fmt_in.video.i_frame_rate_base /
+ p_dec->fmt_in.video.i_frame_rate;
}
+ else if( p_dec->p_sys->i_fps_num )
+ p_sys->i_interpolated_pts +=
+ ( INT64_C(1000000) * (i_time_ref + i_time_increment -
+ p_sys->i_last_time - p_sys->i_last_timeincr) /
+ p_dec->p_sys->i_fps_num );
+
+ p_sys->i_last_time = i_time_ref;
+ p_sys->i_last_timeincr = i_time_increment;
+
+ /* Correct interpolated dts when we receive a new pts/dts */
+ if( p_vop->i_pts > VLC_TS_INVALID )
+ p_sys->i_interpolated_pts = p_vop->i_pts;
+ if( p_vop->i_dts > VLC_TS_INVALID )
+ p_sys->i_interpolated_dts = p_vop->i_dts;
+
+ if( (p_sys->i_flags & BLOCK_FLAG_TYPE_B) || !p_sys->b_frame )
+ {
+ /* Trivial case (DTS == PTS) */
- p_frame->i_length = 1000000 / 25;
- p_frame->i_bitrate= 0;
- p_frame->i_dts = p_pack->i_dts;
- p_frame->i_pts = p_pack->i_dts;
+ p_sys->i_interpolated_dts = p_sys->i_interpolated_pts;
- p_pack->i_dts += 1000000 / 25;
- sout_InputSendBuffer( p_pack->p_sout_input, p_frame );
-}
+ if( p_vop->i_pts > VLC_TS_INVALID )
+ p_sys->i_interpolated_dts = p_vop->i_pts;
+ if( p_vop->i_dts > VLC_TS_INVALID )
+ p_sys->i_interpolated_dts = p_vop->i_dts;
+ p_sys->i_interpolated_pts = p_sys->i_interpolated_dts;
+ }
+ else
+ {
+ if( p_sys->i_last_ref_pts > VLC_TS_INVALID )
+ p_sys->i_interpolated_dts = p_sys->i_last_ref_pts;
-/*****************************************************************************
- * EndThread : packetizer thread destruction
- *****************************************************************************/
-static void EndThread ( packetizer_thread_t *p_pack)
+ p_sys->i_last_ref_pts = p_sys->i_interpolated_pts;
+ }
+
+ return VLC_SUCCESS;
+}
+
+/* look at ffmpeg av_log2 ;) */
+static int vlc_log2( unsigned int v )
{
- if( p_pack->p_sout_input )
+ int n = 0;
+ static const int vlc_log2_table[16] =
+ {
+ 0,0,1,1,2,2,2,2, 3,3,3,3,3,3,3,3
+ };
+
+ if( v&0xffff0000 )
{
- sout_InputDelete( p_pack->p_sout_input );
+ v >>= 16;
+ n += 16;
}
-}
+ if( v&0xff00 )
+ {
+ v >>= 8;
+ n += 8;
+ }
+ if( v&0xf0 )
+ {
+ v >>= 4;
+ n += 4;
+ }
+ n += vlc_log2_table[v];
+ return n;
+}
projects / vlc / blobdiff