comparison libmpdemux/demuxer.c @ 18917:d9a75b26da6c

Add a new video pts tracking mode, enabled by option -correct-pts. This mode has the following differences: - Video timing is correct for streams with B frames, at least with some demuxers. - Video filters can modify frame timestamps and insert new frames, and removing frames is handled better than before. - Some things are known to break, it's not usable as the default yet. Things should work as before when the -correct-pts option is not used.

18916:a95ed361d16b

      ds->buffer_pos=0;
      ds->buffer_size=p->len;
      ds->pos=p->pos;
      ds->dpos+=p->len; // !!!
      ++ds->pack_no;
      if(p->pts){
        ds->pts=p->pts;
        ds->pts_bytes=0;
      }
      ds->pts_bytes+=p->len; // !!!
      ds->flags=p->flags;

	if (!ds_fill_buffer(ds)) {
            // EOF
            *start = NULL;
            return -1;
	}
	// Should use MP_NOPTS_VALUE for "unknown pts" in the packets too
	if (ds->current->pts)
	    *pts = ds->current->pts;
    }
    len=ds->buffer_size-ds->buffer_pos;
    *start = &ds->buffer[ds->buffer_pos];
    ds->buffer_pos+=len;
    return len;
}

  return -1;
}

int extension_parsing=1; // 0=off 1=mixed (used only for unstable formats)

/*
  NOTE : Several demuxers may be opened at the same time so
  demuxers should NEVER rely on an external var to enable them
  self. If a demuxer can't do any autodection it should only use

18917:d9a75b26da6c

      ds->buffer_pos=0;
      ds->buffer_size=p->len;
      ds->pos=p->pos;
      ds->dpos+=p->len; // !!!
      ++ds->pack_no;
      if (p->pts != (correct_pts ? MP_NOPTS_VALUE : 0)) {
        ds->pts=p->pts;
        ds->pts_bytes=0;
      }
      ds->pts_bytes+=p->len; // !!!
      ds->flags=p->flags;

	if (!ds_fill_buffer(ds)) {
            // EOF
            *start = NULL;
            return -1;
	}
    }
    // Should use MP_NOPTS_VALUE for "unknown pts" in the packets too
    // Return pts unless this read starts from the middle of a packet
    if (!ds->buffer_pos && (correct_pts || ds->current->pts))
	*pts = ds->current->pts;
    len=ds->buffer_size-ds->buffer_pos;
    *start = &ds->buffer[ds->buffer_pos];
    ds->buffer_pos+=len;
    return len;
}

  return -1;
}

int extension_parsing=1; // 0=off 1=mixed (used only for unstable formats)

int correct_pts=0;

/*
  NOTE : Several demuxers may be opened at the same time so
  demuxers should NEVER rely on an external var to enable them
  self. If a demuxer can't do any autodection it should only use