/*****************************************************************************
- * mpeg4video.c
+ * mpeg4video.c: mpeg 4 video packetizer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpeg4video.c,v 1.13 2003/09/02 20:19:26 gbazin Exp $
+ * $Id: mpeg4video.c,v 1.16 2003/11/18 20:15:38 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
+ * Gildas Bazin <gbazin@netcourrier.com>
*
* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <stdlib.h> /* malloc(), free() */
+
#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() */
-
-#include "codecs.h"
+#include "vlc_bits.h"
/*****************************************************************************
- * Local prototypes
+ * Module descriptor
*****************************************************************************/
-typedef struct packetizer_thread_s
-{
- /* Input properties */
- decoder_fifo_t *p_fifo;
-
- /* Output properties */
- sout_packetizer_input_t *p_sout_input;
- sout_format_t output_format;
-
- mtime_t i_last_pts;
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
- int i_vol;
- uint8_t *p_vol;
-
-} packetizer_thread_t;
+vlc_module_begin();
+ set_description( _("MPEG4 Video packetizer") );
+ set_capability( "packetizer", 50 );
+ set_callbacks( Open, Close );
+vlc_module_end();
-static int Open ( vlc_object_t * );
-static int Run ( decoder_fifo_t * );
-static int InitThread ( packetizer_thread_t * );
-static void PacketizeThread ( packetizer_thread_t * );
-static void EndThread ( packetizer_thread_t * );
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+static block_t *Packetize( decoder_t *, block_t ** );
+struct decoder_sys_t
+{
+ /*
+ * Common properties
+ */
+ mtime_t i_pts;
+ mtime_t i_dts;
-static void input_ShowPES( decoder_fifo_t *p_fifo, pes_packet_t **pp_pes );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
+ vlc_bool_t b_vop;
+ int i_buffer;
+ int i_buffer_size;
+ uint8_t *p_buffer;
+};
-vlc_module_begin();
- set_description( _("MPEG4 Video packetizer") );
- set_capability( "packetizer", 50 );
- set_callbacks( Open, NULL );
-vlc_module_end();
+static int m4v_FindStartCode( uint8_t **pp_start, uint8_t *p_end );
+static int m4v_VOLParse( es_format_t *fmt, uint8_t *p_vol, int i_vol );
#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
-
/*****************************************************************************
- * 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_t *p_dec = (decoder_t*)p_this;
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
- p_dec->pf_run = Run;
-
- switch( p_dec->p_fifo->i_fourcc )
+ switch( p_dec->fmt_in.i_codec )
{
case VLC_FOURCC( 'm', '4', 's', '2'):
case VLC_FOURCC( 'M', '4', 'S', '2'):
case VLC_FOURCC( 'D', 'X', '5', '0'):
case VLC_FOURCC( 0x04, 0, 0, 0):
case VLC_FOURCC( '3', 'I', 'V', '2'):
+ break;
- return VLC_SUCCESS;
default:
return VLC_EGENERIC;
}
-}
-
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int Run( decoder_fifo_t *p_fifo )
-{
- packetizer_thread_t *p_pack;
- int b_error;
- msg_Info( p_fifo, "Running MPEG4 Video packetizer" );
- if( !( p_pack = malloc( sizeof( packetizer_thread_t ) ) ) )
+ /* Allocate the memory needed to store the decoder's structure */
+ if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL )
{
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
+ msg_Err( p_dec, "out of memory" );
+ return VLC_EGENERIC;
}
- memset( p_pack, 0, sizeof( packetizer_thread_t ) );
-
- p_pack->p_fifo = p_fifo;
+ p_sys->i_pts = 0;
+ p_sys->b_vop = VLC_FALSE;
+ p_sys->i_buffer = 0;
+ p_sys->i_buffer_size = 10000;
+ p_sys->p_buffer = malloc( p_sys->i_buffer_size );
- if( InitThread( p_pack ) != 0 )
- {
- DecoderError( p_fifo );
- return( -1 );
- }
+ /* Setup properties */
+ p_dec->fmt_out = p_dec->fmt_in;
+ p_dec->fmt_out.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
- while( ( !p_pack->p_fifo->b_die )&&( !p_pack->p_fifo->b_error ) )
+ if( p_dec->fmt_in.i_extra )
{
- PacketizeThread( p_pack );
+ /* We have a vol */
+ p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra;
+ p_dec->fmt_out.p_extra = malloc( 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 );
+ m4v_VOLParse( &p_dec->fmt_out,
+ p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
}
-
-
- if( ( b_error = p_pack->p_fifo->b_error ) )
+ else
{
- DecoderError( p_pack->p_fifo );
+ /* 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;
}
- EndThread( p_pack );
- if( b_error )
- {
- return( -1 );
- }
+ /* Set callback */
+ p_dec->pf_packetize = Packetize;
- return( 0 );
+ return VLC_SUCCESS;
}
-
-#define FREE( p ) if( p ) free( p ); p = NULL
-
/*****************************************************************************
- * InitThread: initialize data before entering main loop
+ * Close: clean up the packetizer
*****************************************************************************/
-
-static int InitThread( packetizer_thread_t *p_pack )
+static void Close( vlc_object_t *p_this )
{
- BITMAPINFOHEADER *p_bih;
+ decoder_t *p_dec = (decoder_t*)p_this;
- p_bih = (BITMAPINFOHEADER*)p_pack->p_fifo->p_bitmapinfoheader;
+ free( p_dec->p_sys );
+}
- if( p_bih && p_bih->biSize > sizeof( BITMAPINFOHEADER ) )
- {
- /* We have a vol */
- p_pack->i_vol = p_bih->biSize - sizeof( BITMAPINFOHEADER );
- p_pack->p_vol = malloc( p_pack->i_vol );
- memcpy( p_pack->p_vol, &p_bih[1], p_pack->i_vol );
-
- /* create stream input output */
- p_pack->output_format.i_cat = VIDEO_ES;
- p_pack->output_format.i_fourcc = VLC_FOURCC( 'm', 'p', '4', 'v' );
- p_pack->output_format.i_width = p_bih->biWidth;
- p_pack->output_format.i_height = p_bih->biHeight;
- p_pack->output_format.i_bitrate= 0;
-
- p_pack->output_format.i_extra_data = p_pack->i_vol;
- p_pack->output_format.p_extra_data = malloc( p_pack->i_vol );
- memcpy( p_pack->output_format.p_extra_data,
- p_pack->p_vol,
- p_pack->i_vol );
-
- msg_Warn( p_pack->p_fifo, "opening with vol size:%d", p_pack->i_vol );
- p_pack->p_sout_input =
- sout_InputNew( p_pack->p_fifo,
- &p_pack->output_format );
- }
- else
- {
- p_pack->i_vol = 0;
- p_pack->p_vol = 0;
- p_pack->output_format.i_cat = UNKNOWN_ES;
- p_pack->output_format.i_fourcc = VLC_FOURCC( 'n', 'u', 'l', 'l' );
- 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;
-
- p_pack->p_sout_input =
- sout_InputNew( p_pack->p_fifo,
- &p_pack->output_format );
- }
+/****************************************************************************
+ * 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;
- if( !p_pack->p_sout_input )
- {
- msg_Err( p_pack->p_fifo, "cannot add a new stream" );
- return( -1 );
- }
- p_pack->i_last_pts = 0;
+ block_t *p_chain_out = NULL;
+ block_t *p_block;
+ uint8_t *p_vol = NULL;
+ uint8_t *p_start;
- return VLC_SUCCESS;
-}
+ if( !pp_block || !*pp_block ) return NULL;
-static int m4v_FindStartCode( uint8_t **pp_data, uint8_t *p_end )
-{
- for( ; *pp_data < p_end - 4; (*pp_data)++ )
+ p_block = *pp_block;
+
+ /* Append data */
+ if( p_sys->i_buffer + p_block->i_buffer > p_sys->i_buffer_size )
{
- if( (*pp_data)[0] == 0 && (*pp_data)[1] == 0 && (*pp_data)[2] == 1 )
- {
- return( 0 );
- }
+ p_sys->i_buffer_size += p_block->i_buffer + 1024;
+ p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size );
}
- fprintf( stderr, "\n********* cannot find startcode\n" );
- return( -1 );
-}
-/*****************************************************************************
- * PacketizeThread: packetize an unit (here copy a complete pes)
- *****************************************************************************/
-static void PacketizeThread( packetizer_thread_t *p_pack )
-{
- sout_buffer_t *p_sout_buffer;
- pes_packet_t *p_pes;
- ssize_t i_size;
- mtime_t i_pts;
-
- /* **** get samples count **** */
- input_ExtractPES( p_pack->p_fifo, &p_pes );
- if( !p_pes )
+ memcpy( &p_sys->p_buffer[p_sys->i_buffer], p_block->p_buffer,
+ p_block->i_buffer );
+ p_sys->i_buffer += p_block->i_buffer;
+
+ if( p_sys->i_buffer > 10*1000000 )
{
- p_pack->p_fifo->b_error = 1;
- return;
+ msg_Err( p_dec, "mmh reseting context" );
+ p_sys->i_buffer = 0;
}
- i_pts = p_pes->i_pts;
-#if 0
- if( i_pts <= 0 && p_pack->i_last_pts <= 0 )
+ /* Search vop */
+ p_start = &p_sys->p_buffer[p_sys->i_buffer - p_block->i_buffer - 4];
+ if( p_start < p_sys->p_buffer )
{
- msg_Dbg( p_pack->p_fifo, "need a starting pts" );
- input_DeletePES( p_pack->p_fifo->p_packets_mgt, p_pes );
- return;
+ p_start = p_sys->p_buffer;
}
-#endif
-
- i_size = p_pes->i_pes_size;
- if( i_size > 0 )
+ for( ;; )
{
- pes_packet_t *p_pes_next;
- data_packet_t *p_data;
- ssize_t i_buffer;
+ if( m4v_FindStartCode( &p_start, &p_sys->p_buffer[p_sys->i_buffer] ) )
+ {
+ block_Release( p_block );
+ *pp_block = NULL;
+ return p_chain_out;
+ }
+ /* fprintf( stderr, "start code=0x1%2.2x\n", p_start[3] ); */
- p_sout_buffer =
- sout_BufferNew( p_pack->p_sout_input->p_sout, i_size );
- if( !p_sout_buffer )
+ if( p_vol )
{
- p_pack->p_fifo->b_error = 1;
- return;
+ /* Copy the complete VOL */
+ p_dec->fmt_out.i_extra = p_start - p_vol;
+ p_dec->fmt_out.p_extra = malloc( p_dec->fmt_out.i_extra );
+ memcpy( p_dec->fmt_out.p_extra, p_vol, p_dec->fmt_out.i_extra );
+ m4v_VOLParse( &p_dec->fmt_out,
+ p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
+
+ p_vol = NULL;
}
- /* TODO: memcpy of the pes packet */
- for( i_buffer = 0, p_data = p_pes->p_first;
- p_data != NULL && i_buffer < i_size;
- p_data = p_data->p_next)
+ if( p_sys->b_vop )
{
- ssize_t i_copy;
+ /* Output the complete VOP we have */
+ int i_out = p_start - p_sys->p_buffer;
+ block_t *p_out = block_New( p_dec, i_out );
- i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
- i_size - i_buffer );
- if( i_copy > 0 )
+ /* extract data */
+ memcpy( p_out->p_buffer, p_sys->p_buffer, i_out );
+ if( i_out < p_sys->i_buffer )
{
- p_pack->p_fifo->p_vlc->pf_memcpy( p_sout_buffer->p_buffer + i_buffer,
- p_data->p_payload_start,
- i_copy );
+ memmove( p_sys->p_buffer, &p_sys->p_buffer[i_out],
+ p_sys->i_buffer - i_out );
+ }
+ p_sys->i_buffer -= i_out;
+ p_start -= i_out;
+
+ /* FIXME do proper dts/pts */
+ p_out->i_pts = p_sys->i_pts;
+ p_out->i_dts = p_sys->i_dts;
+ /* FIXME doesn't work when there is multiple VOP in one block */
+ if( p_block->i_dts > p_sys->i_dts )
+ {
+ p_out->i_length = p_block->i_dts - p_sys->i_dts;
}
- i_buffer += i_copy;
- }
- input_ShowPES( p_pack->p_fifo, &p_pes_next );
- if( p_pes_next && p_pes_next->i_pts > 0 )
- {
- mtime_t i_gap;
+ if( p_dec->fmt_out.i_extra > 0 )
+ {
+ block_ChainAppend( &p_chain_out, p_out );
+ }
+ else
+ {
+ msg_Warn( p_dec, "waiting for VOL" );
+ block_Release( p_out );
+ }
- i_gap = p_pes_next->i_pts - p_pes->i_pts;
- p_sout_buffer->i_length = i_gap;
- }
- else
- {
- p_sout_buffer->i_length = 0;
+#if 0
+ fprintf( stderr, "pts=%lld dts=%lld length=%lldms\n",
+ p_out->i_pts, p_out->i_dts,
+ p_out->i_length / 1000 );
+#endif
+ p_sys->b_vop = VLC_FALSE;
}
- p_sout_buffer->i_dts = i_pts;
- p_sout_buffer->i_pts = i_pts;
- p_sout_buffer->i_bitrate = 0;
- if( p_pack->p_vol == NULL )
+ if( p_start[3] >= 0x20 && p_start[3] <= 0x2f )
{
- uint8_t *p_vol_begin, *p_vol_end, *p_end;
- /* search if p_sout_buffer contains with a vol */
- p_vol_begin = p_sout_buffer->p_buffer;
- p_vol_end = NULL;
- p_end = p_sout_buffer->p_buffer + p_sout_buffer->i_size;
-
- for( ;; )
- {
- if( m4v_FindStartCode( &p_vol_begin, p_end ) )
- {
- break;
- }
- msg_Dbg( p_pack->p_fifo,
- "starcode 0x%2.2x%2.2x%2.2x%2.2x",
- p_vol_begin[0], p_vol_begin[1], p_vol_begin[2], p_vol_begin[3] );
-
- if( ( p_vol_begin[3] & ~VIDEO_OBJECT_MASK ) == ( VIDEO_OBJECT_START_CODE&0xff ) )
- {
- p_vol_end = p_vol_begin + 4;
- if( m4v_FindStartCode( &p_vol_end, p_end ) )
- {
- break;
- }
- if( ( p_vol_end[3] & ~VIDEO_OBJECT_LAYER_MASK ) == ( VIDEO_OBJECT_LAYER_START_CODE&0xff ) )
- {
- p_vol_end += 4;
- if( m4v_FindStartCode( &p_vol_end, p_end ) )
- {
- p_vol_end = p_end;
- }
- }
- else
- {
- p_vol_end = NULL;
- }
- }
- else if( ( p_vol_begin[3] & ~VIDEO_OBJECT_LAYER_MASK ) == ( VIDEO_OBJECT_LAYER_START_CODE&0xff) )
- {
- p_vol_end = p_vol_begin + 4;
- if( m4v_FindStartCode( &p_vol_end, p_end ) )
- {
- p_vol_end = p_end;
- }
- }
-
- if( p_vol_end != NULL && p_vol_begin < p_vol_end )
- {
- BITMAPINFOHEADER *p_bih =
- (BITMAPINFOHEADER*)p_pack->p_fifo->p_bitmapinfoheader;
- p_pack->i_vol = p_vol_end - p_vol_begin;
- msg_Dbg( p_pack->p_fifo, "Reopening output" );
-
- p_pack->p_vol = malloc( p_pack->i_vol );
- memcpy( p_pack->p_vol, p_vol_begin, p_pack->i_vol );
-
- sout_InputDelete( p_pack->p_sout_input );
-
- p_pack->output_format.i_cat = VIDEO_ES;
- p_pack->output_format.i_fourcc = VLC_FOURCC( 'm', 'p', '4', 'v' );
-
- if( p_bih )
- {
- p_pack->output_format.i_width = p_bih->biWidth;
- p_pack->output_format.i_height = p_bih->biHeight;
- }
- else
- {
- 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 = p_pack->i_vol;
- p_pack->output_format.p_extra_data = malloc( p_pack->i_vol );
- memcpy( p_pack->output_format.p_extra_data,
- p_pack->p_vol,
- p_pack->i_vol );
-
- p_pack->p_sout_input =
- sout_InputNew( p_pack->p_fifo,
- &p_pack->output_format );
- if( !p_pack->p_sout_input )
- {
- p_pack->p_fifo->b_error = 1;
- return;
- }
-
- break;
- }
- else
- {
- p_vol_begin += 4;
- }
- }
+ /* Start of the VOL */
+ p_vol = p_start;
}
-
- if( i_pts > 0 )
+ else if( p_start[3] == 0xb6 )
{
- sout_InputSendBuffer( p_pack->p_sout_input,
- p_sout_buffer );
+ p_sys->b_vop = VLC_TRUE;
+ p_sys->i_pts = p_block->i_pts;
+ p_sys->i_dts = p_block->i_dts;
}
- else
+ p_start += 4; /* Next */
+ }
+}
+
+/****************************************************************************
+ * m4v_FindStartCode
+ ****************************************************************************/
+static int m4v_FindStartCode( uint8_t **pp_start, uint8_t *p_end )
+{
+ uint8_t *p = *pp_start;
+
+ for( p = *pp_start; p < p_end - 4; p++ )
+ {
+ if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
{
- sout_BufferDelete( p_pack->p_sout_input->p_sout,
- p_sout_buffer );
+ *pp_start = p;
+ return VLC_SUCCESS;
}
}
- input_DeletePES( p_pack->p_fifo->p_packets_mgt, p_pes );
+ *pp_start = p_end;
+ return VLC_EGENERIC;
}
-/*****************************************************************************
- * EndThread : packetizer thread destruction
- *****************************************************************************/
-static void EndThread ( packetizer_thread_t *p_pack)
+/* 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 )
+ {
+ v >>= 16;
+ n += 16;
+ }
+ if( v&0xff00 )
{
- sout_InputDelete( p_pack->p_sout_input );
+ v >>= 8;
+ n += 8;
}
- free( p_pack );
+ if( v&0xf0 )
+ {
+ v >>= 4;
+ n += 4;
+ }
+ n += vlc_log2_table[v];
+
+ return n;
}
-static void input_ShowPES( decoder_fifo_t *p_fifo, pes_packet_t **pp_pes )
+/* m4v_VOLParse:
+ * TODO:
+ * - support aspect ratio
+ */
+static int m4v_VOLParse( es_format_t *fmt, uint8_t *p_vol, int i_vol )
{
- pes_packet_t *p_pes;
+ bs_t s;
+ int i_vo_type;
+ int i_vo_ver_id;
+ int i_ar;
+ int i_shape;
+ int i_time_increment_resolution;
+
+ for( ;; )
+ {
+ 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;
+ }
+ }
- vlc_mutex_lock( &p_fifo->data_lock );
+ /* parse the vol */
+ bs_init( &s, &p_vol[4], i_vol - 4 );
- if( p_fifo->p_first == NULL )
+ 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 = bs_read( &s, 8 );
+ int i_ar_height= bs_read( &s, 8 );
+ }
+ if( bs_read1( &s ) )
{
- if( p_fifo->b_die )
+ /* vol control parameter */
+ int i_chroma_format = bs_read( &s, 2 );
+ int i_low_delay = bs_read1( &s );
+
+ if( bs_read1( &s ) )
{
- vlc_mutex_unlock( &p_fifo->data_lock );
- if( pp_pes ) *pp_pes = NULL;
- return;
+ 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 )
+ {
+ bs_skip( &s, 4 );
+ }
- /* Signal the input thread we're waiting. This is only
- * needed in case of slave clock (ES plug-in) but it won't
- * harm. */
- vlc_cond_signal( &p_fifo->data_wait );
-
- /* Wait for the input to tell us when we received a packet. */
- vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
+ if( !bs_read1( &s ) )
+ {
+ /* marker */
+ return VLC_EGENERIC;
+ }
+ i_time_increment_resolution = bs_read( &s, 16 );
+ if( !bs_read1( &s ) )
+ {
+ /* marker */
+ return VLC_EGENERIC;
}
- p_pes = p_fifo->p_first;
- vlc_mutex_unlock( &p_fifo->data_lock );
- if( pp_pes )
+ if( bs_read1( &s ) )
{
- *pp_pes = p_pes;
+ int i_time_increment_bits = vlc_log2( i_time_increment_resolution - 1 ) + 1;
+ if( i_time_increment_bits < 1 )
+ {
+ i_time_increment_bits = 1;
+ }
+ bs_skip( &s, i_time_increment_bits );
+ }
+ if( i_shape == 0 )
+ {
+ 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 VLC_SUCCESS;
}
+
+
+
projects / vlc / blobdiff