/*****************************************************************************
* vpar_headers.c : headers parsing
- * (c)1999 VideoLAN
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_headers.c,v 1.83 2001/05/01 04:18:18 sam Exp $
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Stéphane Borel <stef@via.ecp.fr>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
+#include "defs.h"
+
+#include <stdlib.h> /* free() */
+#include <string.h> /* memcpy(), memset() */
#include "config.h"
#include "common.h"
+#include "threads.h"
#include "mtime.h"
-#include "vlc_thread.h"
#include "intf_msg.h"
-#include "debug.h" /* ?? temporaire, requis par netlist.h */
-#include "input.h"
-#include "input_netlist.h"
-#include "decoder_fifo.h"
+#include "stream_control.h"
+#include "input_ext-dec.h"
+
#include "video.h"
#include "video_output.h"
-#include "vdec_idct.h"
#include "video_decoder.h"
#include "vdec_motion.h"
+#include "../video_decoder/vdec_idct.h"
#include "vpar_blocks.h"
-#include "vpar_headers.h"
-#include "video_fifo.h"
-#include "vpar_synchro.h"
-#include "video_parser.h"
-#include "vpar_motion.h"
+#include "../video_decoder/vpar_headers.h"
+#include "../video_decoder/vpar_synchro.h"
+#include "../video_decoder/video_parser.h"
+#include "../video_decoder/video_fifo.h"
+
+#include "main.h" /* XXX REMOVE THIS */
/*
* Local prototypes
*/
-static __inline__ void NextStartCode( vpar_thread_t * p_vpar );
+static __inline__ void NextStartCode( bit_stream_t * );
static void SequenceHeader( vpar_thread_t * p_vpar );
static void GroupHeader( vpar_thread_t * p_vpar );
static void PictureHeader( vpar_thread_t * p_vpar );
-static void SliceHeader00( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code );
-static void SliceHeader01( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code );
-static void SliceHeader10( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code );
-static void SliceHeader11( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code );
-static __inline__ void SliceHeader( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code );
static void ExtensionAndUserData( vpar_thread_t * p_vpar );
static void QuantMatrixExtension( vpar_thread_t * p_vpar );
static void SequenceScalableExtension( vpar_thread_t * p_vpar );
/*****************************************************************************
* pi_default_intra_quant : default quantization matrix
*****************************************************************************/
-#ifndef VDEC_DFT
-int pi_default_intra_quant[] =
+u8 pi_default_intra_quant[] =
{
8, 16, 19, 22, 26, 27, 29, 34,
16, 16, 22, 24, 27, 29, 34, 37,
26, 27, 29, 32, 35, 40, 48, 58,
26, 27, 29, 34, 38, 46, 56, 69,
27, 29, 35, 38, 46, 56, 69, 83
-};
-#else
-int pi_default_intra_quant[] =
-{
- 2048, 5681, 6355, 6623, 6656, 5431, 4018, 2401,
- 5681, 7880, 10207, 10021, 9587, 8091, 6534, 3625,
- 6355, 10207, 11363, 10619, 9700, 8935, 6155, 3507,
- 6623, 9186, 10226, 9557, 8730, 8041, 6028, 3322,
- 5632, 9232, 9031, 8730, 8192, 7040, 5542, 3390,
- 5230, 7533, 7621, 7568, 7040, 6321, 5225, 3219,
- 3602, 5189, 5250, 5539, 5265, 5007, 4199, 2638,
- 1907, 2841, 3230, 3156, 3249, 3108, 2638, 1617
};
-#endif
/*****************************************************************************
* pi_default_nonintra_quant : default quantization matrix
*****************************************************************************/
-#ifndef VDEC_DFT
-int pi_default_nonintra_quant[] =
+u8 pi_default_nonintra_quant[] =
{
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16
};
-#else
-int pi_default_nonintra_quanit[] =
-{
- 4096, 5680, 5344, 4816, 4096, 3216, 2224, 1136,
- 5680, 7888, 7424, 6688, 5680, 4464, 3072, 1568,
- 5344, 7424, 6992, 6288, 5344, 4208, 2896, 1472,
- 4816, 6688, 6288, 5664, 4816, 3792, 2608, 1328,
- 4096, 5680, 5344, 4816, 4096, 3216, 2224, 1136,
- 3216, 4464, 4208, 3792, 3216, 2528, 1744, 880,
- 2224, 3072, 2896, 2608, 2224, 1744, 1200, 608,
- 1136, 1568, 1472, 1328, 1136, 880, 608, 304
-};
-#endif
/*****************************************************************************
* pi_scan : zig-zag and alternate scan patterns
* Local inline functions.
*/
-/*****************************************************************************
- * NextStartCode : Find the next start code
- *****************************************************************************/
-static __inline__ void NextStartCode( vpar_thread_t * p_vpar )
-{
- /* Re-align the buffer on an 8-bit boundary */
- RealignBits( &p_vpar->bit_stream );
-
- while( ShowBits( &p_vpar->bit_stream, 24 ) != 0x01L && !p_vpar->b_die )
- {
- RemoveBits( &p_vpar->bit_stream, 8 );
- }
-}
-
/*****************************************************************************
* ReferenceUpdate : Update the reference pointers when we have a new picture
*****************************************************************************/
if( i_coding_type != B_CODING_TYPE )
{
if( p_vpar->sequence.p_forward != NULL )
+ {
vout_UnlinkPicture( p_vpar->p_vout, p_vpar->sequence.p_forward );
+ }
+ if( p_vpar->sequence.p_backward != NULL )
+ {
+ vout_DatePicture( p_vpar->p_vout, p_vpar->sequence.p_backward,
+ vpar_SynchroDate( p_vpar ) );
+ }
p_vpar->sequence.p_forward = p_vpar->sequence.p_backward;
p_vpar->sequence.p_backward = p_newref;
if( p_newref != NULL )
+ {
vout_LinkPicture( p_vpar->p_vout, p_newref );
+ }
+ }
+ else if( p_newref != NULL )
+ {
+ /* Put date immediately. */
+ vout_DatePicture( p_vpar->p_vout, p_newref, vpar_SynchroDate(p_vpar) );
}
}
/*****************************************************************************
* ReferenceReplace : Replace the last reference pointer when we destroy
- * a picture
+ * a picture
*****************************************************************************/
static void __inline__ ReferenceReplace( vpar_thread_t * p_vpar,
int i_coding_type,
if( i_coding_type != B_CODING_TYPE )
{
if( p_vpar->sequence.p_backward != NULL )
+ {
vout_UnlinkPicture( p_vpar->p_vout, p_vpar->sequence.p_backward );
+ }
p_vpar->sequence.p_backward = p_newref;
if( p_newref != NULL )
+ {
vout_LinkPicture( p_vpar->p_vout, p_newref );
+ }
}
}
/*****************************************************************************
* LoadMatrix : Load a quantization matrix
*****************************************************************************/
-static __inline__ void LoadMatrix( vpar_thread_t * p_vpar, quant_matrix_t * p_matrix )
+static __inline__ void LoadMatrix( vpar_thread_t * p_vpar,
+ quant_matrix_t * p_matrix )
{
int i_dummy;
-
+
if( !p_matrix->b_allocated )
{
/* Allocate a piece of memory to load the matrix. */
- p_matrix->pi_matrix = (int *)malloc( 64*sizeof(int) );
+ if( (p_matrix->pi_matrix = (u8 *)malloc( 64*sizeof(u8) )) == NULL )
+ {
+ intf_ErrMsg( "vpar error: allocation error in LoadMatrix()" );
+ p_vpar->p_fifo->b_error = 1;
+ return;
+ }
p_matrix->b_allocated = 1;
}
-
+
for( i_dummy = 0; i_dummy < 64; i_dummy++ )
{
- p_matrix->pi_matrix[pi_scan[SCAN_ZIGZAG][i_dummy]]
+ p_matrix->pi_matrix[p_vpar->ppi_scan[SCAN_ZIGZAG][i_dummy]]
= GetBits( &p_vpar->bit_stream, 8 );
}
/*****************************************************************************
* LinkMatrix : Link a quantization matrix to another
*****************************************************************************/
-static __inline__ void LinkMatrix( quant_matrix_t * p_matrix, int * pi_array )
+static __inline__ void LinkMatrix( quant_matrix_t * p_matrix, u8 * pi_array )
{
- int i_dummy;
-
if( p_matrix->b_allocated )
{
/* Deallocate the piece of memory. */
free( p_matrix->pi_matrix );
p_matrix->b_allocated = 0;
}
-
+
p_matrix->pi_matrix = pi_array;
}
*****************************************************************************/
int vpar_NextSequenceHeader( vpar_thread_t * p_vpar )
{
- while( !p_vpar->b_die )
+ while( !p_vpar->p_fifo->b_die )
{
- NextStartCode( p_vpar );
+ NextStartCode( &p_vpar->bit_stream );
if( ShowBits( &p_vpar->bit_stream, 32 ) == SEQUENCE_HEADER_CODE )
+ {
return 0;
+ }
RemoveBits( &p_vpar->bit_stream, 8 );
}
return 1;
*****************************************************************************/
int vpar_ParseHeader( vpar_thread_t * p_vpar )
{
- while( !p_vpar->b_die )
+ while( !p_vpar->p_fifo->b_die )
{
- NextStartCode( p_vpar );
+ NextStartCode( &p_vpar->bit_stream );
switch( GetBits32( &p_vpar->bit_stream ) )
{
case SEQUENCE_HEADER_CODE:
- fprintf( stderr, "begin sequence header\n" );
+#ifdef STATS
+ p_vpar->c_sequences++;
+#endif
SequenceHeader( p_vpar );
- fprintf( stderr, "end sequence header\n" );
return 0;
break;
case GROUP_START_CODE:
- fprintf( stderr, "begin group\n" );
GroupHeader( p_vpar );
- fprintf( stderr, "end group\n" );
return 0;
break;
break;
case SEQUENCE_END_CODE:
- fprintf( stderr, "sequence header end code\n" );
+ intf_DbgMsg("vpar debug: sequence end code received");
return 1;
break;
default:
+ break;
}
}
*****************************************************************************/
static void SequenceHeader( vpar_thread_t * p_vpar )
{
-#define RESERVED -1
- static float r_frame_rate_table[16] =
+#define RESERVED -1
+ static int i_frame_rate_table[16] =
{
- 0.0,
- ((23.0*1000.0)/1001.0),
- 24.0,
- 25.0,
- ((30.0*1000.0)/1001.0),
- 30.0,
- 50.0,
- ((60.0*1000.0)/1001.0),
- 60.0,
+ 0,
+ 23 * 1000,
+ 24 * 1001,
+ 25 * 1001,
+ 30 * 1000,
+ 30 * 1001,
+ 50 * 1001,
+ 60 * 1000,
+ 60 * 1001,
RESERVED, RESERVED, RESERVED, RESERVED, RESERVED, RESERVED, RESERVED
};
#undef RESERVED
int i_height_save, i_width_save;
-
+
i_height_save = p_vpar->sequence.i_height;
i_width_save = p_vpar->sequence.i_width;
p_vpar->sequence.i_width = GetBits( &p_vpar->bit_stream, 12 );
p_vpar->sequence.i_height = GetBits( &p_vpar->bit_stream, 12 );
p_vpar->sequence.i_aspect_ratio = GetBits( &p_vpar->bit_stream, 4 );
- p_vpar->sequence.r_frame_rate =
- r_frame_rate_table[ GetBits( &p_vpar->bit_stream, 4 ) ];
+ p_vpar->sequence.i_frame_rate =
+ i_frame_rate_table[ GetBits( &p_vpar->bit_stream, 4 ) ];
/* We don't need bit_rate_value, marker_bit, vbv_buffer_size,
* constrained_parameters_flag */
RemoveBits( &p_vpar->bit_stream, 30 );
-
+
/*
* Quantization matrices
*/
else
{
/* Use default matrix. */
- LinkMatrix( &p_vpar->sequence.intra_quant, pi_default_intra_quant );
+ LinkMatrix( &p_vpar->sequence.intra_quant,
+ p_vpar->pi_default_intra_quant );
}
-
- if( GetBits( &p_vpar->bit_stream, 1 ) ) /* load_non_intra_quantizer_matrix */
+
+ if( GetBits(&p_vpar->bit_stream, 1) ) /* load_non_intra_quantizer_matrix */
{
LoadMatrix( p_vpar, &p_vpar->sequence.nonintra_quant );
}
else
{
/* Use default matrix. */
- LinkMatrix( &p_vpar->sequence.nonintra_quant, pi_default_nonintra_quant );
+ LinkMatrix( &p_vpar->sequence.nonintra_quant,
+ p_vpar->pi_default_nonintra_quant );
}
-
+
/* Unless later overwritten by a matrix extension, we have the same
* matrices for luminance and chrominance. */
LinkMatrix( &p_vpar->sequence.chroma_intra_quant,
/*
* Sequence Extension
*/
- NextStartCode( p_vpar );
+ NextStartCode( &p_vpar->bit_stream );
if( ShowBits( &p_vpar->bit_stream, 32 ) == EXTENSION_START_CODE )
{
int i_dummy;
- static f_chroma_pattern_t ppf_chroma_pattern[4] =
- {NULL, vpar_CodedPattern420,
- vpar_CodedPattern422, vpar_CodedPattern444};
/* Turn the MPEG2 flag on */
p_vpar->sequence.b_mpeg2 = 1;
-
+
/* Parse sequence_extension */
RemoveBits32( &p_vpar->bit_stream );
/* extension_start_code_identifier, profile_and_level_indication */
RemoveBits( &p_vpar->bit_stream, 12 );
p_vpar->sequence.b_progressive = GetBits( &p_vpar->bit_stream, 1 );
p_vpar->sequence.i_chroma_format = GetBits( &p_vpar->bit_stream, 2 );
- p_vpar->sequence.pf_decode_pattern = ppf_chroma_pattern
- [p_vpar->sequence.i_chroma_format];
p_vpar->sequence.i_width |= GetBits( &p_vpar->bit_stream, 2 ) << 12;
p_vpar->sequence.i_height |= GetBits( &p_vpar->bit_stream, 2 ) << 12;
- /* bit_rate_extension, marker_bit, vbv_buffer_size_extension, low_delay */
+ /* bit_rate_extension, marker_bit, vbv_buffer_size_extension,
+ * low_delay */
RemoveBits( &p_vpar->bit_stream, 22 );
/* frame_rate_extension_n */
i_dummy = GetBits( &p_vpar->bit_stream, 2 );
/* frame_rate_extension_d */
- p_vpar->sequence.r_frame_rate *= (i_dummy + 1)
+ p_vpar->sequence.i_frame_rate *= (i_dummy + 1)
/ (GetBits( &p_vpar->bit_stream, 5 ) + 1);
-
- p_vpar->sequence.pf_decode_mv = vpar_MPEG2MotionVector;
}
else
{
p_vpar->sequence.b_mpeg2 = 0;
p_vpar->sequence.b_progressive = 1;
p_vpar->sequence.i_chroma_format = CHROMA_420;
- p_vpar->sequence.pf_decode_pattern = vpar_CodedPattern420;
-
- p_vpar->sequence.pf_decode_mv = vpar_MPEG1MotionVector;
}
/* Update sizes */
p_vpar->sequence.i_mb_width = (p_vpar->sequence.i_width + 15) / 16;
p_vpar->sequence.i_mb_height = (p_vpar->sequence.b_progressive) ?
(p_vpar->sequence.i_height + 15) / 16 :
- 2 * (p_vpar->sequence.i_height + 31) / 32;
+ 2 * ((p_vpar->sequence.i_height + 31) / 32);
p_vpar->sequence.i_mb_size = p_vpar->sequence.i_mb_width
* p_vpar->sequence.i_mb_height;
p_vpar->sequence.i_width = (p_vpar->sequence.i_mb_width * 16);
p_vpar->sequence.i_size = p_vpar->sequence.i_width
* p_vpar->sequence.i_height;
- /* Update chromatic information */
+ /* Update chromatic information. */
switch( p_vpar->sequence.i_chroma_format )
{
case CHROMA_420:
p_vpar->sequence.i_chroma_nb_blocks = 2;
- p_vpar->sequence.i_chroma_width = p_vpar->sequence.i_width >> 2;
+ p_vpar->sequence.i_chroma_width = p_vpar->sequence.i_width >> 1;
p_vpar->sequence.i_chroma_mb_width = 8;
p_vpar->sequence.i_chroma_mb_height = 8;
break;
p_vpar->sequence.i_chroma_mb_height = 16;
}
- /* Slice Header functions */
- if( p_vpar->sequence.i_height <= 2800 )
- {
- if( p_vpar->sequence.i_scalable_mode != SC_DP )
- {
- p_vpar->sequence.pf_slice_header = SliceHeader00;
- }
- else
- {
- p_vpar->sequence.pf_slice_header = SliceHeader01;
- }
- }
- else
- {
- if( p_vpar->sequence.i_scalable_mode != SC_DP )
- {
- p_vpar->sequence.pf_slice_header = SliceHeader10;
- }
- else
- {
- p_vpar->sequence.pf_slice_header = SliceHeader11;
- }
- }
+ /* Reset scalable_mode. */
+ p_vpar->sequence.i_scalable_mode = SC_NONE;
+#if 0
if( p_vpar->sequence.i_width != i_width_save
|| p_vpar->sequence.i_height != i_height_save )
{
- /* What do we do in case of a size change ??? */
+ /* FIXME: What do we do in case of a size change ?? */
}
+#endif
/* Extension and User data */
ExtensionAndUserData( p_vpar );
+
+ /* XXX: The vout request and fifo opening will eventually be here */
+ if( p_main->p_vout == NULL )
+ {
+ intf_Msg( "vpar: no vout present, spawning one" );
+ p_main->p_vout = p_vpar->p_vout = vout_CreateThread( NULL );
+ }
}
/*****************************************************************************
*****************************************************************************/
static void PictureHeader( vpar_thread_t * p_vpar )
{
- static f_macroblock_type_t ppf_macroblock_type[5] = {NULL,
- vpar_IMBType, vpar_PMBType,
- vpar_BMBType, vpar_DMBType};
-
int i_structure;
- int i_mb_address, i_mb_base, i_mb;
- elem_t * p_y, p_u, p_v;
+ int i_mb_base;
boolean_t b_parsable;
- u32 i_dummy;
-
+#ifdef VDEC_SMP
+ int i_mb;
+#endif
+
+ /* Recover in case of stream discontinuity. */
+ if( p_vpar->sequence.b_expect_discontinuity )
+ {
+ ReferenceUpdate( p_vpar, I_CODING_TYPE, NULL );
+ ReferenceUpdate( p_vpar, I_CODING_TYPE, NULL );
+ if( p_vpar->picture.p_picture != NULL )
+ {
+#ifdef VDEC_SMP
+ int i_mb;
+
+ for( i_mb = 0; p_vpar->picture.pp_mb[i_mb] != NULL; i_mb++ )
+ {
+ vpar_DestroyMacroblock( &p_vpar->vfifo,
+ p_vpar->picture.pp_mb[i_mb] );
+ }
+#endif
+ vout_DestroyPicture( p_vpar->p_vout, p_vpar->picture.p_picture );
+ }
+ p_vpar->sequence.b_expect_discontinuity = 0;
+ }
+
+ /* Parse the picture header. */
RemoveBits( &p_vpar->bit_stream, 10 ); /* temporal_reference */
p_vpar->picture.i_coding_type = GetBits( &p_vpar->bit_stream, 3 );
- p_vpar->picture.pf_macroblock_type = ppf_macroblock_type
- [p_vpar->picture.i_coding_type];
RemoveBits( &p_vpar->bit_stream, 16 ); /* vbv_delay */
-
- if( p_vpar->picture.i_coding_type == P_CODING_TYPE || p_vpar->picture.i_coding_type == B_CODING_TYPE )
+
+ if( p_vpar->picture.i_coding_type == P_CODING_TYPE
+ || p_vpar->picture.i_coding_type == B_CODING_TYPE )
{
p_vpar->picture.pb_full_pel_vector[0] = GetBits( &p_vpar->bit_stream, 1 );
p_vpar->picture.i_forward_f_code = GetBits( &p_vpar->bit_stream, 3 );
RemoveBits( &p_vpar->bit_stream, 8 );
}
- /*
+ /*
* Picture Coding Extension
*/
- NextStartCode( p_vpar );
+ NextStartCode( &p_vpar->bit_stream );
if( ShowBits( &p_vpar->bit_stream, 32 ) == EXTENSION_START_CODE )
{
/* Parse picture_coding_extension */
RemoveBits32( &p_vpar->bit_stream );
/* extension_start_code_identifier */
RemoveBits( &p_vpar->bit_stream, 4 );
-
+
p_vpar->picture.ppi_f_code[0][0] = GetBits( &p_vpar->bit_stream, 4 );
p_vpar->picture.ppi_f_code[0][1] = GetBits( &p_vpar->bit_stream, 4 );
p_vpar->picture.ppi_f_code[1][0] = GetBits( &p_vpar->bit_stream, 4 );
p_vpar->picture.b_intra_vlc_format = GetBits( &p_vpar->bit_stream, 1 );
p_vpar->picture.b_alternate_scan = GetBits( &p_vpar->bit_stream, 1 );
p_vpar->picture.b_repeat_first_field = GetBits( &p_vpar->bit_stream, 1 );
- /* repeat_first_field (ISO/IEC 13818-2 6.3.10 is necessary to know
- * the length of the picture_display_extension structure.
- * chroma_420_type (obsolete) */
+ /* chroma_420_type (obsolete) */
RemoveBits( &p_vpar->bit_stream, 1 );
- p_vpar->picture.b_progressive_frame = GetBits( &p_vpar->bit_stream, 1 );
-
+ p_vpar->picture.b_progressive = GetBits( &p_vpar->bit_stream, 1 );
+
/* composite_display_flag */
if( GetBits( &p_vpar->bit_stream, 1 ) )
{
/* MPEG-1 compatibility flags */
p_vpar->picture.i_intra_dc_precision = 0; /* 8 bits */
i_structure = FRAME_STRUCTURE;
+ p_vpar->picture.b_top_field_first = 0;
p_vpar->picture.b_frame_pred_frame_dct = 1;
p_vpar->picture.b_concealment_mv = 0;
p_vpar->picture.b_q_scale_type = 0;
p_vpar->picture.b_intra_vlc_format = 0;
p_vpar->picture.b_alternate_scan = 0; /* zigzag */
p_vpar->picture.b_repeat_first_field = 0;
- p_vpar->picture.b_progressive_frame = 1;
+ p_vpar->picture.b_progressive = 1;
}
+#ifdef STATS
+ p_vpar->pc_pictures[p_vpar->picture.i_coding_type]++;
+#endif
+
if( p_vpar->picture.i_current_structure &&
(i_structure == FRAME_STRUCTURE ||
i_structure == p_vpar->picture.i_current_structure) )
p_vpar->picture.i_coding_type,
NULL );
- for( i_mb = 0; i_mb < p_vpar->sequence.i_mb_size >> 1; i_mb++ )
+#ifdef VDEC_SMP
+ for( i_mb = 0; p_vpar->picture.pp_mb[i_mb] != NULL; i_mb++ )
{
vpar_DestroyMacroblock( &p_vpar->vfifo,
p_vpar->picture.pp_mb[i_mb] );
}
+#endif
vout_DestroyPicture( p_vpar->p_vout, p_vpar->picture.p_picture );
}
-
+
p_vpar->picture.i_current_structure = 0;
- intf_DbgMsg("vpar debug: odd number of field picture.\n");
+ intf_WarnMsg( 2, "Odd number of field pictures." );
}
+ /* Do we have the reference pictures ? */
+ b_parsable = !(((p_vpar->picture.i_coding_type == P_CODING_TYPE) &&
+ (p_vpar->sequence.p_backward == NULL)) ||
+ /* p_backward will become p_forward later */
+ ((p_vpar->picture.i_coding_type == B_CODING_TYPE) &&
+ (p_vpar->sequence.p_forward == NULL ||
+ p_vpar->sequence.p_backward == NULL)));
+
if( p_vpar->picture.i_current_structure )
{
/* Second field of a frame. We will decode it if, and only if we
- * have decoded the first frame. */
- b_parsable = (p_vpar->picture.p_picture != NULL);
+ * have decoded the first field. */
+ if( b_parsable )
+ {
+ b_parsable = (p_vpar->picture.p_picture != NULL);
+ }
}
else
{
- /* Do we have the reference pictures ? */
- b_parsable = !((p_vpar->picture.i_coding_type == P_CODING_TYPE) &&
- (p_vpar->sequence.p_forward == NULL)) ||
- ((p_vpar->picture.i_coding_type == B_CODING_TYPE) &&
- (p_vpar->sequence.p_forward == NULL ||
- p_vpar->sequence.p_backward == NULL));
+ int i_repeat_field;
+
+ /* Compute the number of times the frame will be emitted by the
+ * decoder (number of half-periods). */
+ if( p_vpar->sequence.b_progressive )
+ {
+ i_repeat_field = (1 + p_vpar->picture.b_repeat_first_field
+ + p_vpar->picture.b_top_field_first) * 2;
+ }
+ else
+ {
+ if( p_vpar->picture.b_progressive )
+ {
+ i_repeat_field = 2 + p_vpar->picture.b_repeat_first_field;
+ }
+ else
+ {
+ i_repeat_field = 2;
+ }
+ }
+
+ /* Warn synchro we have a new picture (updates pictures index). */
+ vpar_SynchroNewPicture( p_vpar, p_vpar->picture.i_coding_type,
+ i_repeat_field );
if( b_parsable )
{
{
/* Update the reference pointers. */
ReferenceUpdate( p_vpar, p_vpar->picture.i_coding_type, NULL );
-
- /* Warn Synchro we have trashed a picture. */
- vpar_SynchroTrash( p_vpar, p_vpar->picture.i_coding_type, i_structure );
/* Update context. */
if( i_structure != FRAME_STRUCTURE )
- p_vpar->picture.i_current_structure = i_structure;
+ {
+ if( (p_vpar->picture.i_current_structure | i_structure)
+ == FRAME_STRUCTURE )
+ {
+ p_vpar->picture.i_current_structure = 0;
+ }
+ else
+ {
+ /* The frame is complete. */
+ p_vpar->picture.i_current_structure = i_structure;
+
+ vpar_SynchroTrash( p_vpar, p_vpar->picture.i_coding_type, i_structure );
+ }
+ }
+ else
+ {
+ /* Warn Synchro we have trashed a picture. */
+ vpar_SynchroTrash( p_vpar, p_vpar->picture.i_coding_type, i_structure );
+ }
p_vpar->picture.p_picture = NULL;
return;
}
- fprintf(stderr, "begin picture\n");
/* OK, now we are sure we will decode the picture. */
+#ifdef STATS
+ p_vpar->pc_decoded_pictures[p_vpar->picture.i_coding_type]++;
+#endif
+
#define P_picture p_vpar->picture.p_picture
p_vpar->picture.b_error = 0;
+ p_vpar->picture.b_frame_structure = (i_structure == FRAME_STRUCTURE);
if( !p_vpar->picture.i_current_structure )
{
/* This is a new frame. Get a structure from the video_output. */
- P_picture = vout_CreatePicture( p_vpar->p_vout,
- 99+p_vpar->sequence.i_chroma_format, /*???*/
+ while( ( P_picture = vout_CreatePicture( p_vpar->p_vout,
+ /* XXX */ 99+p_vpar->sequence.i_chroma_format,
p_vpar->sequence.i_width,
- p_vpar->sequence.i_height,
- p_vpar->sequence.i_width*sizeof(yuv_data_t) );
+ p_vpar->sequence.i_height ) )
+ == NULL )
+ {
+ intf_DbgMsg("vpar debug: allocation error in vout_CreatePicture, delaying");
+ if( p_vpar->p_fifo->b_die || p_vpar->p_fifo->b_error )
+ {
+ return;
+ }
+ msleep( VPAR_OUTMEM_SLEEP );
+ }
/* Initialize values. */
- P_picture->date = vpar_SynchroDecode( p_vpar,
- p_vpar->picture.i_coding_type,
- i_structure );
- p_vpar->picture.i_l_stride = - 8 + ( p_vpar->sequence.i_width
+ vpar_SynchroDecode( p_vpar, p_vpar->picture.i_coding_type, i_structure );
+ P_picture->i_aspect_ratio = p_vpar->sequence.i_aspect_ratio;
+ P_picture->i_matrix_coefficients = p_vpar->sequence.i_matrix_coefficients;
+ p_vpar->picture.i_l_stride = ( p_vpar->sequence.i_width
<< ( 1 - p_vpar->picture.b_frame_structure ) );
- p_vpar->picture.i_c_stride = -8 + ( p_vpar->sequence.i_width
- << (( 1 - p_vpar->picture.b_frame_structure ) +
- ( 3 - p_vpar->sequence.i_chroma_format )) );
+ p_vpar->picture.i_c_stride = ( p_vpar->sequence.i_chroma_width
+ << ( 1 - p_vpar->picture.b_frame_structure ));
+
+ P_picture->i_deccount = p_vpar->sequence.i_mb_size;
+#ifdef VDEC_SMP
+ memset( p_vpar->picture.pp_mb, 0, MAX_MB*sizeof(macroblock_t *) );
+#endif
+/* FIXME ! remove asap ?? */
+//memset( P_picture->p_data, 0, (p_vpar->sequence.i_mb_size*384));
/* Update the reference pointers. */
ReferenceUpdate( p_vpar, p_vpar->picture.i_coding_type, P_picture );
+
+#ifdef VDEC_SMP
+ /* Link referenced pictures for the decoder
+ * They are unlinked in vpar_ReleaseMacroblock() &
+ * vpar_DestroyMacroblock() */
+ if( p_vpar->picture.i_coding_type == P_CODING_TYPE ||
+ p_vpar->picture.i_coding_type == B_CODING_TYPE )
+ {
+ vout_LinkPicture( p_vpar->p_vout, p_vpar->sequence.p_forward );
+ }
+ if( p_vpar->picture.i_coding_type == B_CODING_TYPE )
+ {
+ vout_LinkPicture( p_vpar->p_vout, p_vpar->sequence.p_backward );
+ }
+#endif
}
p_vpar->picture.i_current_structure |= i_structure;
p_vpar->picture.i_structure = i_structure;
- p_vpar->picture.b_frame_structure = (i_structure == FRAME_STRUCTURE);
/* Initialize picture data for decoding. */
if( i_structure == BOTTOM_FIELD )
{
i_mb_base = p_vpar->sequence.i_mb_size >> 1;
- p_vpar->mb.i_l_y = 16;
- p_vpar->mb.i_c_y = p_vpar->sequence.i_chroma_mb_height;
+ p_vpar->mb.i_l_y = 1;
+ p_vpar->mb.i_c_y = 1;
}
else
{
i_mb_base = 0;
p_vpar->mb.i_l_y = p_vpar->mb.i_c_y = 0;
}
- i_mb_address = 0;
p_vpar->mb.i_l_x = p_vpar->mb.i_c_x = 0;
/* Extension and User data. */
ExtensionAndUserData( p_vpar );
- /* Picture data (ISO/IEC 13818-2 6.2.3.7). */
- NextStartCode( p_vpar );
- while( i_mb_address+i_mb_base < p_vpar->sequence.i_mb_size
- && !p_vpar->picture.b_error && !p_vpar->b_die )
+ /* This is an MP@ML decoder, please note that neither of the following
+ * assertions can be true :
+ * p_vpar->sequence.i_chroma_format != CHROMA_420
+ * p_vpar->sequence.i_height > 2800
+ * p_vpar->sequence.i_scalable_mode == SC_DP
+ * Be cautious if you try to use the decoder for other profiles and
+ * levels.
+ */
+ if( p_vpar->sequence.b_mpeg2 )
{
- if( ((i_dummy = ShowBits( &p_vpar->bit_stream, 32 ))
- < SLICE_START_CODE_MIN) ||
- (i_dummy > SLICE_START_CODE_MAX) )
+ static f_picture_data_t ppf_picture_data[4][4] =
{
- intf_DbgMsg("vpar debug: premature end of picture");
- p_vpar->picture.b_error = 1;
- break;
- }
- RemoveBits32( &p_vpar->bit_stream );
-
- /* Decode slice data. */
- p_vpar->sequence.pf_slice_header( p_vpar, &i_mb_address, i_mb_base, i_dummy & 255 );
+ {
+ NULL, NULL, NULL, NULL
+ },
+ {
+ /* TOP_FIELD */
+#if (VPAR_OPTIM_LEVEL > 1)
+ NULL, vpar_PictureData2IT, vpar_PictureData2PT,
+ vpar_PictureData2BT
+#else
+ NULL, vpar_PictureDataGENERIC, vpar_PictureDataGENERIC,
+ vpar_PictureDataGENERIC
+#endif
+ },
+ {
+ /* BOTTOM_FIELD */
+#if (VPAR_OPTIM_LEVEL > 1)
+ NULL, vpar_PictureData2IB, vpar_PictureData2PB,
+ vpar_PictureData2BB
+#else
+ NULL, vpar_PictureDataGENERIC, vpar_PictureDataGENERIC,
+ vpar_PictureDataGENERIC
+#endif
+ },
+ {
+ /* FRAME_PICTURE */
+#if (VPAR_OPTIM_LEVEL > 0)
+ NULL, vpar_PictureData2IF, vpar_PictureData2PF,
+ vpar_PictureData2BF
+#else
+ NULL, vpar_PictureDataGENERIC, vpar_PictureDataGENERIC,
+ vpar_PictureDataGENERIC
+#endif
+ }
+ };
+
+ ppf_picture_data[p_vpar->picture.i_structure]
+ [p_vpar->picture.i_coding_type]( p_vpar, i_mb_base );
+ }
+ else
+ {
+#if (VPAR_OPTIM_LEVEL > 0)
+ static f_picture_data_t pf_picture_data[5] =
+ { NULL, vpar_PictureData1I, vpar_PictureData1P, vpar_PictureData1B,
+ vpar_PictureData1D };
+
+ pf_picture_data[p_vpar->picture.i_coding_type]( p_vpar, i_mb_base );
+#else
+ vpar_PictureDataGENERIC( p_vpar, i_mb_base );
+#endif
}
-
+
+ if( p_vpar->p_fifo->b_die || p_vpar->p_fifo->b_error )
+ {
+ return;
+ }
+
if( p_vpar->picture.b_error )
{
/* Trash picture. */
-fprintf(stderr, "Image trashee\n");
- for( i_mb = 0; p_vpar->picture.pp_mb[i_mb]; i_mb++ )
+#ifdef VDEC_SMP
+ for( i_mb = 1; p_vpar->picture.pp_mb[i_mb] != NULL; i_mb++ )
{
vpar_DestroyMacroblock( &p_vpar->vfifo, p_vpar->picture.pp_mb[i_mb] );
}
+#endif
+
+#ifdef STATS
+ p_vpar->pc_malformed_pictures[p_vpar->picture.i_coding_type]++;
+#endif
+
+ if( P_picture->i_deccount != 1 )
+ {
+ vpar_SynchroEnd( p_vpar, 1 );
+ vout_DestroyPicture( p_vpar->p_vout, P_picture );
+ }
ReferenceReplace( p_vpar, p_vpar->picture.i_coding_type, NULL );
- vout_DestroyPicture( p_vpar->p_vout, P_picture );
/* Prepare context for the next picture. */
P_picture = NULL;
}
else if( p_vpar->picture.i_current_structure == FRAME_STRUCTURE )
{
-fprintf(stderr, "Image decodee\n");
/* Frame completely parsed. */
- P_picture->i_deccount = p_vpar->sequence.i_mb_size;
- for( i_mb = 0; i_mb < p_vpar->sequence.i_mb_size; i_mb++ )
+#ifdef VDEC_SMP
+ for( i_mb = 1; p_vpar->picture.pp_mb[i_mb] != NULL; i_mb++ )
{
vpar_DecodeMacroblock( &p_vpar->vfifo, p_vpar->picture.pp_mb[i_mb] );
}
- /* Link referenced pictures for the decoder
- * They are unlinked in vpar_ReleaseMacroblock() & vpar_DestroyMacroblock() */
- if( p_vpar->sequence.p_forward != NULL )
- {
- vout_LinkPicture( p_vpar->p_vout, p_vpar->sequence.p_forward );
- }
- if( p_vpar->sequence.p_backward != NULL )
- {
- vout_LinkPicture( p_vpar->p_vout, p_vpar->sequence.p_backward );
- }
-
+ /* Send signal to the video_decoder. */
+ vlc_mutex_lock( &p_vpar->vfifo.lock );
+ vlc_cond_signal( &p_vpar->vfifo.wait );
+ vlc_mutex_unlock( &p_vpar->vfifo.lock );
+#endif
+
/* Prepare context for the next picture. */
P_picture = NULL;
p_vpar->picture.i_current_structure = 0;
#undef P_picture
}
-/*****************************************************************************
- * SliceHeader : Parse the next slice structure
- *****************************************************************************/
-static __inline__ void SliceHeader( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code )
-{
- /* DC predictors initialization table */
- static int pi_dc_dct_reinit[4] = {128,256,512,1024};
-
- int i_mb_address_save = *pi_mb_address;
-
- /* slice_vertical_position_extension and priority_breakpoint already done */
- LoadQuantizerScale( p_vpar );
-
- if( GetBits( &p_vpar->bit_stream, 1 ) )
- {
- /* intra_slice, slice_id */
- RemoveBits( &p_vpar->bit_stream, 8 );
- /* extra_information_slice */
- while( GetBits( &p_vpar->bit_stream, 1 ) )
- {
- RemoveBits( &p_vpar->bit_stream, 8 );
- }
- }
- *pi_mb_address = (i_vert_code - 1)*p_vpar->sequence.i_mb_width;
-
- /* Reset DC coefficients predictors (ISO/IEC 13818-2 7.2.1). Why
- * does the reference decoder put 0 instead of the normative values ? */
- p_vpar->slice.pi_dc_dct_pred[0] = p_vpar->slice.pi_dc_dct_pred[1]
- = p_vpar->slice.pi_dc_dct_pred[2]
- = pi_dc_dct_reinit[p_vpar->picture.i_intra_dc_precision];
-
- /* Reset motion vector predictors (ISO/IEC 13818-2 7.6.3.4). */
- memset( p_vpar->slice.pppi_pmv, 0, 8*sizeof(int) );
-
- do
- {
- vpar_ParseMacroblock( p_vpar, pi_mb_address, i_mb_address_save,
- i_mb_base );
- i_mb_address_save = *pi_mb_address;
- }
- while( ShowBits( &p_vpar->bit_stream, 23 ) && !p_vpar->b_die );
- NextStartCode( p_vpar );
-}
-
-/*****************************************************************************
- * SliceHeaderXY : Parse the next slice structure
- *****************************************************************************
- * X = i_height > 2800 ?
- * Y = scalable_mode == SC_DP ?
- *****************************************************************************/
-static void SliceHeader00( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code )
-{
- SliceHeader( p_vpar, pi_mb_address, i_mb_base, i_vert_code );
-}
-
-static void SliceHeader01( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code )
-{
- RemoveBits( &p_vpar->bit_stream, 7 ); /* priority_breakpoint */
- SliceHeader( p_vpar, pi_mb_address, i_mb_base, i_vert_code );
-}
-
-static void SliceHeader10( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code )
-{
- i_vert_code += GetBits( &p_vpar->bit_stream, 3 ) << 7;
- SliceHeader( p_vpar, pi_mb_address, i_mb_base, i_vert_code );
-}
-
-static void SliceHeader11( vpar_thread_t * p_vpar,
- int * pi_mb_address, int i_mb_base,
- u32 i_vert_code )
-{
- i_vert_code += GetBits( &p_vpar->bit_stream, 3 ) << 7;
- RemoveBits( &p_vpar->bit_stream, 7 ); /* priority_breakpoint */
- SliceHeader( p_vpar, pi_mb_address, i_mb_base, i_vert_code );
-}
-
/*****************************************************************************
* ExtensionAndUserData : Parse the extension_and_user_data structure
*****************************************************************************/
static void ExtensionAndUserData( vpar_thread_t * p_vpar )
{
- while( !p_vpar->b_die )
+ while( !p_vpar->p_fifo->b_die )
{
- NextStartCode( p_vpar );
+ NextStartCode( &p_vpar->bit_stream );
switch( ShowBits( &p_vpar->bit_stream, 32 ) )
{
case EXTENSION_START_CODE:
CopyrightExtension( p_vpar );
break;
default:
+ break;
}
break;
RemoveBits( &p_vpar->bit_stream, 3 );
if( GetBits( &p_vpar->bit_stream, 1 ) )
{
- /* Three bytes for color_desciption */
- RemoveBits( &p_vpar->bit_stream, 24 );
+ /* Two bytes for color_desciption */
+ RemoveBits( &p_vpar->bit_stream, 16 );
+ p_vpar->sequence.i_matrix_coefficients = GetBits( &p_vpar->bit_stream, 8 );
}
/* display_horizontal and vertical_size and a marker_bit */
RemoveBits( &p_vpar->bit_stream, 29 );
{
/* Use the default matrix. */
LinkMatrix( &p_vpar->sequence.intra_quant,
- pi_default_intra_quant );
+ p_vpar->pi_default_intra_quant );
}
if( GetBits( &p_vpar->bit_stream, 1 ) )
{
{
/* Use the default matrix. */
LinkMatrix( &p_vpar->sequence.nonintra_quant,
- pi_default_nonintra_quant );
+ p_vpar->pi_default_nonintra_quant );
}
if( GetBits( &p_vpar->bit_stream, 1 ) )
{
static void PictureDisplayExtension( vpar_thread_t * p_vpar )
{
/* Number of frame center offset */
- int nb;
+ int i_nb, i_dummy;
/* I am not sure it works but it should
(fewer tests than shown in §6.3.12) */
- nb = p_vpar->sequence.b_progressive ? p_vpar->sequence.b_progressive +
- p_vpar->picture.b_repeat_first_field +
- p_vpar->picture.b_top_field_first
- : ( p_vpar->picture.b_frame_structure + 1 ) +
- p_vpar->picture.b_repeat_first_field;
- RemoveBits( &p_vpar->bit_stream, 34 * nb );
+ i_nb = p_vpar->sequence.b_progressive ? p_vpar->sequence.b_progressive +
+ p_vpar->picture.b_repeat_first_field +
+ p_vpar->picture.b_top_field_first
+ : ( p_vpar->picture.b_frame_structure + 1 ) +
+ p_vpar->picture.b_repeat_first_field;
+ for( i_dummy = 0; i_dummy < i_nb; i_dummy++ )
+ {
+ RemoveBits( &p_vpar->bit_stream, 17 );
+ RemoveBits( &p_vpar->bit_stream, 17 );
+ }
}
i_copyright_nb_2 = GetBits( &p_vpar->bit_stream, 22 );
RemoveBits( &p_vpar->bit_stream, 1 );
/* third part and sum */
- p_vpar->sequence.i_copyright_nb = ( (u64)i_copyright_nb_1 << 44 ) +
- ( (u64)i_copyright_nb_2 << 22 ) +
+ p_vpar->sequence.i_copyright_nb = ( (u64)i_copyright_nb_1 << 44 ) |
+ ( (u64)i_copyright_nb_2 << 22 ) |
( (u64)GetBits( &p_vpar->bit_stream, 22 ) );
}
projects / vlc / blobdiff