ssize_t my_read(istream *infile, void *buf, size_t count)
{
#ifdef FILESTAR
- size_t r = fread(buf,1,count, infile->InFd);
+ return fread(buf,1,count, infile->InFd);
#else
- ssize_t r = read(infile->InFd,buf,count);
+ return read(infile->InFd,buf,count);
#endif
- printf( "%d , %d\n", count , r);
- return r;
}
+
int my_close(istream *infile)
{
#ifdef FILESTAR
int my_fopenr(const char *path, const char *mode, istream *os)
{
-#if 0
FILE *fd = fopen(path, mode);
if(fd)
{
}
else
os->InFd = NULL;
-#endif
return 0;
}
char *argv[];
{
int ret, code;
+ istream bos,eos;
/*base.open_stream = my_open;*/
base.seek_stream = my_seek;
base.read_stream = my_read;
/* 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);*/
- istream bos;
base.Infile = &bos;
#ifdef FILESTAR
base.Infile->InFd = fopen(Main_Bitstream_Filename, "rb");
/*if ((enhan.Infile = open(Enhancement_Layer_Bitstream_Filename,O_RDONLY|O_BINARY))<0)*/
/*enhan.Infile = ld->open_stream(Enhancement_Layer_Bitstream_Filename);*/
- istream eos;
enhan.Infile = &eos;
#ifdef FILESTAR
enhan.Infile->InFd = fopen(Main_Bitstream_Filename, "rb");
}
void Error(text)
-char *text;
+const char *text;
{
fprintf(stderr,text);
exit(1);
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);
- }
+ }
}