comparison demux_mpg.c @ 494:16204dea362c

Bad interpretation of a constant by me ...

493:b8f1ed2b411b

  if(id==0x1BE) return -1; // padding stream
  if(id==0x1BF) return -1; // private2

  len=stream_read_word(demux->stream);
  if(verbose>=3)  printf("PACKET len=%d",len);
  if(len==0 || len>STREAM_BUFFER_SIZE) return -2;  // invalid packet !!!!!!

  while(len>0){   // Skip stuFFing bytes
    c=stream_read_char(demux->stream);--len;
    if(c!=0xFF)break;
  }

  } else {
    //if(c!=0x0f) printf("  {ERROR5,c=%d}  \n",c);
  }
  if(verbose>=3) printf(" => len=%d\n",len);

  if(len<=0 || len>STREAM_BUFFER_SIZE) return -1;  // Invalid packet size
  
  if(id>=0x1C0 && id<=0x1DF){
    // mpeg audio
    int aid=id-0x1C0;
    if(!avi_header.a_streams[aid]) new_sh_audio(aid);

int demux_mpg_es_fill_buffer(demuxer_t *demux){
//if(demux->type==DEMUXER_TYPE_MPEG_ES)
  // Elementary video stream
  if(demux->stream->eof) return 0;
  demux->filepos=stream_tell(demux->stream);
  ds_read_packet(demux->video,demux->stream,STREAM_BUFFER_SIZE,0,0);
  return 1;
}

int demux_mpg_fill_buffer(demuxer_t *demux){
unsigned int head=0;

494:16204dea362c

  if(id==0x1BE) return -1; // padding stream
  if(id==0x1BF) return -1; // private2

  len=stream_read_word(demux->stream);
  if(verbose>=3)  printf("PACKET len=%d",len);
  if(len==0 || len>4096) return -2;  // invalid packet !!!!!!

  while(len>0){   // Skip stuFFing bytes
    c=stream_read_char(demux->stream);--len;
    if(c!=0xFF)break;
  }

  } else {
    //if(c!=0x0f) printf("  {ERROR5,c=%d}  \n",c);
  }
  if(verbose>=3) printf(" => len=%d\n",len);

  if(len<=0 || len>4096) return -1;  // Invalid packet size
  
  if(id>=0x1C0 && id<=0x1DF){
    // mpeg audio
    int aid=id-0x1C0;
    if(!avi_header.a_streams[aid]) new_sh_audio(aid);

int demux_mpg_es_fill_buffer(demuxer_t *demux){
//if(demux->type==DEMUXER_TYPE_MPEG_ES)
  // Elementary video stream
  if(demux->stream->eof) return 0;
  demux->filepos=stream_tell(demux->stream);
  ds_read_packet(demux->video,demux->stream,4096,0,0);
  return 1;
}

int demux_mpg_fill_buffer(demuxer_t *demux){
unsigned int head=0;