mirror of
https://github.com/mpv-player/mpv
synced 2024-10-30 04:46:41 +01:00
video: remove codec delay estimation
This was used only by the timestamp sorting code, which is a fallback for avi files (as well as avi-muxed mkv files). This was supposed to prevent accumulating timestamps in case the decoder consumes more packets than it outputs frames (i.e. frames are dropped). This didn't work very well (timestamps could be off by a large amount), the estimation of the delay was fragile, and the interdependencies with the decoder were annoying, so kill it.
This commit is contained in:
parent
ee283843fa
commit
3ccac74de2
@ -213,14 +213,9 @@ bool video_init_best_codec(struct dec_video *d_video, char* video_decoders)
|
||||
static void add_pts_to_sort(struct dec_video *d_video, double pts)
|
||||
{
|
||||
if (pts != MP_NOPTS_VALUE) {
|
||||
int delay = -1;
|
||||
video_vd_control(d_video, VDCTRL_QUERY_UNSEEN_FRAMES, &delay);
|
||||
if (delay >= 0 && delay < d_video->num_buffered_pts)
|
||||
d_video->num_buffered_pts = delay;
|
||||
if (d_video->num_buffered_pts ==
|
||||
sizeof(d_video->buffered_pts) / sizeof(double))
|
||||
if (d_video->num_buffered_pts == MP_ARRAY_SIZE(d_video->buffered_pts)) {
|
||||
MP_ERR(d_video, "Too many buffered pts\n");
|
||||
else {
|
||||
} else {
|
||||
int i, j;
|
||||
for (i = 0; i < d_video->num_buffered_pts; i++)
|
||||
if (d_video->buffered_pts[i] < pts)
|
||||
|
@ -42,7 +42,6 @@ extern const vd_functions_t *const mpcodecs_vd_drivers[];
|
||||
|
||||
enum vd_ctrl {
|
||||
VDCTRL_RESET = 1, // reset decode state after seeking
|
||||
VDCTRL_QUERY_UNSEEN_FRAMES, // current decoder lag
|
||||
VDCTRL_FORCE_HWDEC_FALLBACK, // force software decoding fallback
|
||||
VDCTRL_GET_HWDEC,
|
||||
};
|
||||
|
@ -689,13 +689,6 @@ static int control(struct dec_video *vd, int cmd, void *arg)
|
||||
case VDCTRL_RESET:
|
||||
avcodec_flush_buffers(avctx);
|
||||
return CONTROL_TRUE;
|
||||
case VDCTRL_QUERY_UNSEEN_FRAMES:;
|
||||
int delay = avctx->has_b_frames;
|
||||
assert(delay >= 0);
|
||||
if (avctx->active_thread_type & FF_THREAD_FRAME)
|
||||
delay += avctx->thread_count - 1;
|
||||
*(int *)arg = delay;
|
||||
return CONTROL_TRUE;
|
||||
case VDCTRL_GET_HWDEC: {
|
||||
int hwdec = ctx->hwdec ? ctx->hwdec->type : 0;
|
||||
if (!ctx->software_fallback_decoder)
|
||||
|
Loading…
Reference in New Issue
Block a user