Commit 422bd79f authored by Christophe Massiot's avatar Christophe Massiot
Browse files

Fixed a bug in period calculation for progressive sequences.

parent 5f6c5900
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing * vpar_headers.c : headers parsing
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_headers.c,v 1.75 2001/01/21 01:36:26 massiot Exp $ * $Id: vpar_headers.c,v 1.76 2001/02/06 17:17:04 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -540,8 +540,7 @@ static void PictureHeader( vpar_thread_t * p_vpar ) ...@@ -540,8 +540,7 @@ static void PictureHeader( vpar_thread_t * p_vpar )
p_vpar->picture.b_q_scale_type = 0; p_vpar->picture.b_q_scale_type = 0;
p_vpar->picture.b_intra_vlc_format = 0; p_vpar->picture.b_intra_vlc_format = 0;
p_vpar->picture.b_alternate_scan = 0; /* zigzag */ p_vpar->picture.b_alternate_scan = 0; /* zigzag */
p_vpar->picture.b_repeat_first_field = 1; /* FIXME! this contradicts p_vpar->picture.b_repeat_first_field = 0;
* ISO/IEC */
p_vpar->picture.b_progressive = 1; p_vpar->picture.b_progressive = 1;
} }
...@@ -597,11 +596,11 @@ static void PictureHeader( vpar_thread_t * p_vpar ) ...@@ -597,11 +596,11 @@ static void PictureHeader( vpar_thread_t * p_vpar )
int i_repeat_field; int i_repeat_field;
/* Compute the number of times the frame will be emitted by the /* Compute the number of times the frame will be emitted by the
* decoder (number of periods). */ * decoder (number of half-periods). */
if( p_vpar->sequence.b_progressive ) if( p_vpar->sequence.b_progressive )
{ {
i_repeat_field = 1 + p_vpar->picture.b_repeat_first_field i_repeat_field = (1 + p_vpar->picture.b_repeat_first_field
+ p_vpar->picture.b_top_field_first; + p_vpar->picture.b_top_field_first) * 2;
} }
else else
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment