comparison demux_avi.c @ 1421:ea0a0b9e6fbc

nosound avi seeking fixed

1420:d97816161256

int ret=0;

do{
  int flags=0;
  AVIINDEXENTRY *idx=NULL;
  demux->filepos=stream_tell(demux->stream);
  if(demux->filepos>=demux->movi_end){
          demux->stream->eof=1;
          return 0;
  }
  if(stream_eof(demux->stream)) return 0;
  if(demux->idx_size>0 && demux->idx_pos<demux->idx_size){
    unsigned int pos;
    
    //if(demux->idx_pos<0) printf("Fatal! idx_pos=%d\n",demux->idx_pos);
    

      continue; // skip this chunk
    }

    pos=idx->dwChunkOffset+demux->idx_offset;
    if(pos<demux->movi_start || pos>=demux->movi_end){
      printf("ChunkOffset out of range!  current=0x%X  idx=0x%X  \n",demux->filepos,pos);
      continue;
    }
#if 0
    if(pos!=demux->filepos){
      printf("Warning! pos=0x%X  idx.pos=0x%X  diff=%d   \n",demux->filepos,pos,pos-demux->filepos);
    }
#endif
    stream_seek(demux->stream,pos);
    id=stream_read_dword_le(demux->stream);
    if(id!=idx->ckid){
      printf("ChunkID mismatch! raw=%.4s idx=%.4s  \n",(char *)&id,(char *)&idx->ckid);
      continue;
    }
    len=stream_read_dword_le(demux->stream);

      printf("ChunkSize mismatch! raw=%d idx=%ld  \n",len,idx->dwChunkLength);
      continue;
    }
    if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
  } else {
    id=stream_read_dword_le(demux->stream);
    len=stream_read_dword_le(demux->stream);
    if(id==mmioFOURCC('L','I','S','T')){
      id=stream_read_dword_le(demux->stream);      // list type
      continue;
    }
  }

1421:ea0a0b9e6fbc

int ret=0;

do{
  int flags=0;
  AVIINDEXENTRY *idx=NULL;
#if 0
  demux->filepos=stream_tell(demux->stream);
  if(demux->filepos>=demux->movi_end){
          demux->stream->eof=1;
          return 0;
  }
  if(stream_eof(demux->stream)) return 0;
#endif
  if(demux->idx_size>0 && demux->idx_pos<demux->idx_size){
    unsigned int pos;
    
    //if(demux->idx_pos<0) printf("Fatal! idx_pos=%d\n",demux->idx_pos);
    

      continue; // skip this chunk
    }

    pos=idx->dwChunkOffset+demux->idx_offset;
    if(pos<demux->movi_start || pos>=demux->movi_end){
      printf("ChunkOffset out of range!   idx=0x%X  \n",pos);
      continue;
    }
#if 0
    if(pos!=demux->filepos){
      printf("Warning! pos=0x%X  idx.pos=0x%X  diff=%d   \n",demux->filepos,pos,pos-demux->filepos);
    }
#endif
    stream_seek(demux->stream,pos);
    demux->filepos=stream_tell(demux->stream);
    id=stream_read_dword_le(demux->stream);
    if(stream_eof(demux->stream)) return 0; // EOF!
    
    if(id!=idx->ckid){
      printf("ChunkID mismatch! raw=%.4s idx=%.4s  \n",(char *)&id,(char *)&idx->ckid);
      continue;
    }
    len=stream_read_dword_le(demux->stream);

      printf("ChunkSize mismatch! raw=%d idx=%ld  \n",len,idx->dwChunkLength);
      continue;
    }
    if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
  } else {
    demux->filepos=stream_tell(demux->stream);
    if(demux->filepos>=demux->movi_end){
          demux->stream->eof=1;
          return 0;
    }
    id=stream_read_dword_le(demux->stream);
    len=stream_read_dword_le(demux->stream);
    if(stream_eof(demux->stream)) return 0; // EOF!
    
    if(id==mmioFOURCC('L','I','S','T')){
      id=stream_read_dword_le(demux->stream);      // list type
      continue;
    }
  }