Browse Source

Revert "WIP"

This reverts commit 46f8ddafd3284259d2781283aa148fea54a2db55.
Alexandre Janniaux 5 years ago
parent
commit
5a9cb1c89f
  1. 13
      src/video_output/video_output.c

13
src/video_output/video_output.c

@ -2217,18 +2217,13 @@ static void *Thread(void *object)
case VOUT_STATE_SAMPLE: {
vlc_tick_t deadline = VLC_TICK_INVALID;
const bool picture_interlaced = sys->displayed.is_interlaced;
vout_SetInterlacingState(&vout->obj, &sys->private, picture_interlaced);
bool wait = DisplayPicture(vout, &deadline) != VLC_SUCCESS;
sys->state.display.deadline = deadline;
sys->state.display.wait = wait;
if (wait)
sys->state.current = VOUT_STATE_CONTROL;
else if(sys->displayed.next == NULL)
sys->state.current = VOUT_STATE_PREPARE;
else
sys->state.current = VOUT_STATE_DISPLAY;
const bool picture_interlaced = sys->displayed.is_interlaced;
vout_SetInterlacingState(&vout->obj, &sys->private, picture_interlaced);
if (wait) sys->state.current = VOUT_STATE_CONTROL;
else sys->state.current = VOUT_STATE_DISPLAY;
break;
}

Loading…
Cancel
Save