X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmmpeg2%2Fsrc%2Fmpeg2dec%2Fglobal.h;h=a0c0647d57e83513a3b71c0eabecea360d30ab4a;hb=3705811f0b24769b2222f7d5ad2b14f8fd932104;hp=86558064a44fe4a9902147ea934b99d0964baef9;hpb=564b105de075ba4db5c3c6075874955f33e18f7e;p=gdcm.git

diff --git a/src/gdcmmpeg2/src/mpeg2dec/global.h b/src/gdcmmpeg2/src/mpeg2dec/global.h
index 86558064..a0c0647d 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/global.h
+++ b/src/gdcmmpeg2/src/mpeg2dec/global.h
@@ -72,7 +72,7 @@ void Decode_MPEG2_Non_Intra_Block _ANSI_ARGS_((int comp));
 int Get_Hdr _ANSI_ARGS_((void));
 void next_start_code _ANSI_ARGS_((void));
 int slice_header _ANSI_ARGS_((void));
-void marker_bit _ANSI_ARGS_((char *text));
+void marker_bit _ANSI_ARGS_((const char *text));
 
 /* getpic.c */
 void Decode_Picture _ANSI_ARGS_((int bitstream_framenum, 
@@ -105,7 +105,7 @@ void motion_vector _ANSI_ARGS_((int *PMV, int *dmvector,
 void Dual_Prime_Arithmetic _ANSI_ARGS_((int DMV[][2], int *dmvector, int mvx, int mvy));
 
 /* mpeg2dec.c */
-void Error _ANSI_ARGS_((char *text));
+void Error _ANSI_ARGS_((const char *text));
 void Warning _ANSI_ARGS_((char *text));
 void Print_Bits _ANSI_ARGS_((int code, int bits, int len));
 
@@ -118,6 +118,7 @@ void form_predictions _ANSI_ARGS_((int bx, int by, int macroblock_type,
 void Spatial_Prediction _ANSI_ARGS_((void));
 
 /* store.c */
+void FreeStaticBuffer _ANSI_ARGS_((void));
 void Write_Frame _ANSI_ARGS_((unsigned char *src[], int frame));
 
 #ifdef DISPLAY
@@ -237,6 +238,7 @@ EXTERN int Inverse_Table_6_9[8][4]
 #define T_PPM   3
 #define T_X11   4
 #define T_X11HIQ 5
+#define T_MEM    6
 
 /* decoder operation control variables */
 EXTERN int Output_Type;
@@ -262,11 +264,13 @@ EXTERN int Main_Bitstream_Flag;
 
 
 /* filenames */
-EXTERN char *Output_Picture_Filename;
-EXTERN char *Substitute_Picture_Filename;
-EXTERN char *Main_Bitstream_Filename; 
-EXTERN char *Enhancement_Layer_Bitstream_Filename; 
+EXTERN const char *Output_Picture_Filename;
+EXTERN const char *Substitute_Picture_Filename;
+EXTERN const char *Main_Bitstream_Filename; 
+EXTERN const char *Enhancement_Layer_Bitstream_Filename; 
 
+/* Pointer to allocated memory */
+EXTERN char *OUTMEM;
 
 /* buffers for multiuse purposes */
 EXTERN char Error_Text[256];
@@ -286,7 +290,7 @@ EXTERN unsigned char *llframe0[3];
 EXTERN unsigned char *llframe1[3];
 
 EXTERN short *lltmp;
-EXTERN char *Lower_Layer_Picture_Filename;
+EXTERN const char *Lower_Layer_Picture_Filename;
 
 
 
@@ -417,20 +421,14 @@ EXTERN int broken_link;
 
 
 
-//FIXME
-#include <sys/types.h>
-#ifdef _WIN32
-typedef int ssize_t;
-#endif
-
 /* layer specific variables (needed for SNR and DP scalability) */
 EXTERN struct layer_data {
   /* bit input */
-  int Infile;
-  int  (*open_stream) (char *filename);
-  off_t   (*seek_stream) (int infile, off_t offset,int whence);
-  ssize_t (*read_stream) (int infile, void *buf, size_t count);
-  int  (*close_stream) (int infile);
+  istream *Infile;
+/*  int  (*open_stream) (char *filename);*/
+  off_t   (*seek_stream) (istream *is, off_t offset,int whence);
+  ssize_t (*read_stream) (istream *is, void *buf, size_t count);
+  int  (*close_stream) (istream *is);
   unsigned char Rdbfr[2048];
   unsigned char *Rdptr;
   unsigned char Inbfr[16];