mirror of https://github.com/mpv-player/mpv
Use x264_encoder_delayed_frames instead of the current hack to flush delayed
frames in VFCTRL_FLUSH_FRAMES. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29705 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
1893615656
commit
de85aebe1e
|
@ -196,12 +196,10 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
|
||||||
static int control(struct vf_instance_s* vf, int request, void *data)
|
static int control(struct vf_instance_s* vf, int request, void *data)
|
||||||
{
|
{
|
||||||
h264_module_t *mod=(h264_module_t*)vf->priv;
|
h264_module_t *mod=(h264_module_t*)vf->priv;
|
||||||
int count = 256; // giant HACK, x264_encoder_encode may incorrectly return 0
|
|
||||||
// when threads > 1 and delayed frames pending
|
|
||||||
switch(request){
|
switch(request){
|
||||||
case VFCTRL_FLUSH_FRAMES:
|
case VFCTRL_FLUSH_FRAMES:
|
||||||
while(encode_frame(vf, NULL) == 0 && --count);
|
while (x264_encoder_delayed_frames(mod->x264) > 0)
|
||||||
while(encode_frame(vf, NULL) > 0);
|
encode_frame(vf, NULL);
|
||||||
return CONTROL_TRUE;
|
return CONTROL_TRUE;
|
||||||
default:
|
default:
|
||||||
return CONTROL_UNKNOWN;
|
return CONTROL_UNKNOWN;
|
||||||
|
|
Loading…
Reference in New Issue