X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmmpeg2%2Fsrc%2Fmpeg2dec%2Fmpeg2dec.c;h=f07432060e07bfdf73d41605bf596c0078841991;hb=d93bdc3a545dc713354ab0c8ad9558ee11dfe0e9;hp=5211f3f702f3ae1718f9397954cd235084ee3aa2;hpb=b5e9b8dee5030829b7e694277a86dc54e14e8f8e;p=gdcm.git

diff --git a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
index 5211f3f7..f0743206 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
@@ -61,20 +61,34 @@ static void Print_Options();
 
 int my_open(char *filename)
 {
+  abort();
   return open(filename,O_RDONLY|O_BINARY);
 }
 
-off_t my_seek(int infile, off_t offset,int whence)
+off_t my_seek(istream *infile, off_t offset, int whence)
 {
-  return lseek(infile, offset, whence);
+#ifdef FILESTAR
+  return fseek(infile->InFd,offset, whence);
+#else
+  return lseek(infile->InFd,offset, whence);
+#endif
 }
-ssize_t my_read(int infile,void *buf,size_t count)
+ssize_t my_read(istream *infile, void *buf, size_t count)
 {
-  return read(infile,buf,count);
+#ifdef FILESTAR
+  return fread(buf,1,count, infile->InFd);
+#else
+  return read(infile->InFd,buf,count);
+#endif
 }
-int my_close(int infile)
+
+int my_close(istream *infile)
 {
-  return close(infile);
+#ifdef FILESTAR
+  return fclose(infile->InFd);
+#else
+  return close(infile->InFd);
+#endif
 }
 
 int my_fopenr(const char *path, const char *mode, istream *os)
@@ -181,7 +195,8 @@ int argc;
 char *argv[];
 {
   int ret, code;
-  base.open_stream = my_open;
+  istream bos,eos;
+  /*base.open_stream = my_open;*/
   base.seek_stream = my_seek;
   base.read_stream = my_read;
   base.close_stream = my_close;
@@ -200,8 +215,14 @@ char *argv[];
   /* open MPEG base layer bitstream file(s) */
   /* NOTE: this is either a base layer stream or a spatial enhancement stream */
 /*  if ((base.Infile=open(Main_Bitstream_Filename,O_RDONLY|O_BINARY))<0) */
-  base.Infile = ld->open_stream(Main_Bitstream_Filename);
-  if( base.Infile < 0 )
+  /*base.Infile = ld->open_stream(Main_Bitstream_Filename);*/
+  base.Infile = &bos;
+#ifdef FILESTAR
+  base.Infile->InFd = fopen(Main_Bitstream_Filename, "rb");
+#else
+  base.Infile->InFd = open(Main_Bitstream_Filename,O_RDONLY|O_BINARY );
+#endif
+  if( !base.Infile->InFd)
   {
     fprintf(stderr,"Base layer input file %s not found\n", Main_Bitstream_Filename);
     exit(1);
@@ -210,8 +231,8 @@ char *argv[];
 
   if(base.Infile != 0)
   {
-    Initialize_Buffer(); 
-  
+    Initialize_Buffer();
+
     if(Show_Bits(8)==0x47)
     {
       sprintf(Error_Text,"Decoder currently does not parse transport streams\n");
@@ -254,8 +275,14 @@ char *argv[];
     ld = &enhan; /* select enhancement layer context */
 
     /*if ((enhan.Infile = open(Enhancement_Layer_Bitstream_Filename,O_RDONLY|O_BINARY))<0)*/
-    enhan.Infile = ld->open_stream(Enhancement_Layer_Bitstream_Filename);
-    if (enhan.Infile<0)
+    /*enhan.Infile = ld->open_stream(Enhancement_Layer_Bitstream_Filename);*/
+    enhan.Infile = &eos;
+#ifdef FILESTAR
+    enhan.Infile->InFd = fopen(Main_Bitstream_Filename, "rb");
+#else
+    enhan.Infile->InFd = open(Enhancement_Layer_Bitstream_Filename,O_RDONLY|O_BINARY);
+#endif
+    if (enhan.Infile->InFd)
     {
       sprintf(Error_Text,"enhancment layer bitstream file %s not found\n",
         Enhancement_Layer_Bitstream_Filename);
@@ -400,7 +427,7 @@ static void Initialize_Sequence()
 }
 
 void Error(text)
-char *text;
+const char *text;
 {
   fprintf(stderr,text);
   exit(1);
@@ -743,21 +770,21 @@ static int Decode_Bitstream()
   Bitstream_Framenum = 0;
 
   for(;;)
-  {
+    {
 
 #ifdef VERIFY
     Clear_Verify_Headers();
 #endif /* VERIFY */
 
     ret = Headers();
-    
+
     if(ret==1)
-    {
-      ret = video_sequence(&Bitstream_Framenum);
-    }
+      {
+      /*ret =*/ video_sequence(&Bitstream_Framenum);
+      }
     else
       return(ret);
-  }
+    }
 
 }