Commit f0f225c4 authored by Christophe Massiot's avatar Christophe Massiot

Fin du parsage des I.

parent ecc98c96
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#define PROGRAM_OPTIONS VIDEO_OPTIONS " " ARCH_OPTIONS #define PROGRAM_OPTIONS VIDEO_OPTIONS " " ARCH_OPTIONS
/* Program version and copyright message */ /* Program version and copyright message */
#define PROGRAM_VERSION "DR 2.1" #define PROGRAM_VERSION "1.0-dev"
#define COPYRIGHT_MESSAGE "VideoLAN Client v" PROGRAM_VERSION " (" __DATE__ ") - " \ #define COPYRIGHT_MESSAGE "VideoLAN Client v" PROGRAM_VERSION " (" __DATE__ ") - " \
PROGRAM_OPTIONS " - (c)1999 VideoLAN" PROGRAM_OPTIONS " - (c)1999 VideoLAN"
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
#define VFIFO_SIZE 4095 #define VFIFO_SIZE 4095
/* Maximum number of macroblocks in a picture. */ /* Maximum number of macroblocks in a picture. */
#define MAX_MB 2048 #define MAX_MB 32767
/******************************************************************************* /*******************************************************************************
* Video decoder configuration * Video decoder configuration
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include "vlc_thread.h" #include "vlc_thread.h"
#include "netutils.h" #include "netutils.h"
#include "debug.h" #include "debug.h"
#include "xutils.h"
#include "intf_msg.h" #include "intf_msg.h"
/* Input */ /* Input */
......
...@@ -186,7 +186,7 @@ static void RunThread( vdec_thread_t *p_vdec ) ...@@ -186,7 +186,7 @@ static void RunThread( vdec_thread_t *p_vdec )
return; return;
} }
p_vdec->b_run = 1; p_vdec->b_run = 1;
p_vdec->b_error = 1;
/* /*
* Main loop - it is not executed if an error occured during * Main loop - it is not executed if an error occured during
* initialization * initialization
......
...@@ -607,7 +607,7 @@ void vpar_ParseMacroblock( vpar_thread_t * p_vpar, int * pi_mb_address, ...@@ -607,7 +607,7 @@ void vpar_ParseMacroblock( vpar_thread_t * p_vpar, int * pi_mb_address,
//*pi_mb_address += MacroblockAddressIncrement( p_vpar ); //*pi_mb_address += MacroblockAddressIncrement( p_vpar );
b_stop = i_inc > 1; b_stop = i_inc > 1;
fprintf( stderr, "inc : %d (%d)\n", *pi_mb_address, i_inc ); // fprintf( stderr, "inc : %d (%d)\n", *pi_mb_address, i_inc );
if( 0 )//i_count > 8 ) if( 0 )//i_count > 8 )
{ {
exit(0); exit(0);
......
...@@ -430,7 +430,7 @@ static void SequenceHeader( vpar_thread_t * p_vpar ) ...@@ -430,7 +430,7 @@ static void SequenceHeader( vpar_thread_t * p_vpar )
p_vpar->sequence.i_mb_width = (p_vpar->sequence.i_width + 15) / 16; 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_mb_height = (p_vpar->sequence.b_progressive) ?
(p_vpar->sequence.i_height + 15) / 16 : (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_size = p_vpar->sequence.i_mb_width
* p_vpar->sequence.i_mb_height; * p_vpar->sequence.i_mb_height;
p_vpar->sequence.i_width = (p_vpar->sequence.i_mb_width * 16); p_vpar->sequence.i_width = (p_vpar->sequence.i_mb_width * 16);
...@@ -747,7 +747,7 @@ fprintf(stderr, "Image trashee\n"); ...@@ -747,7 +747,7 @@ fprintf(stderr, "Image trashee\n");
} }
else if( p_vpar->picture.i_current_structure == FRAME_STRUCTURE ) else if( p_vpar->picture.i_current_structure == FRAME_STRUCTURE )
{ {
fprintf(stderr, "Image decodee\n"); fprintf(stderr, "Image parsee\n");
/* Frame completely parsed. */ /* Frame completely parsed. */
P_picture->i_deccount = p_vpar->sequence.i_mb_size; P_picture->i_deccount = p_vpar->sequence.i_mb_size;
for( i_mb = 0; i_mb < p_vpar->sequence.i_mb_size; i_mb++ ) for( i_mb = 0; i_mb < p_vpar->sequence.i_mb_size; i_mb++ )
......
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