mirror of https://github.com/mpv-player/mpv
reversed r22879 until I discover why it's giving so many sync problems; I'll eventually recommit it in a fixed form
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22927 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
118422ccf0
commit
acb512df10
|
@ -1460,6 +1460,8 @@ static int flush_buffers(muxer_t *muxer, int finalize)
|
||||||
muxer_stream_t *s, *vs, *as;
|
muxer_stream_t *s, *vs, *as;
|
||||||
muxer_headers_t *vpriv = NULL, *apriv = NULL;
|
muxer_headers_t *vpriv = NULL, *apriv = NULL;
|
||||||
muxer_priv_t *priv = (muxer_priv_t *) muxer->priv;
|
muxer_priv_t *priv = (muxer_priv_t *) muxer->priv;
|
||||||
|
double duration;
|
||||||
|
uint64_t iduration, iaduration;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
analyzes all streams and decides what to flush
|
analyzes all streams and decides what to flush
|
||||||
|
@ -1496,10 +1498,29 @@ static int flush_buffers(muxer_t *muxer, int finalize)
|
||||||
|
|
||||||
vpriv = (muxer_headers_t*) vs->priv;
|
vpriv = (muxer_headers_t*) vs->priv;
|
||||||
|
|
||||||
if(as != NULL) apriv = (muxer_headers_t*) as->priv;
|
duration = 0;
|
||||||
if(as != NULL && (apriv->size == 0))
|
iduration = 0;
|
||||||
|
for(i = 0; i < n; i++)
|
||||||
|
iduration += vpriv->framebuf[i].idur;
|
||||||
|
duration = (double) (iduration / 27000000.0);
|
||||||
|
|
||||||
|
if(as != NULL)
|
||||||
{
|
{
|
||||||
apriv = (muxer_headers_t*) as->priv;
|
apriv = (muxer_headers_t*) as->priv;
|
||||||
|
iaduration = 0;
|
||||||
|
for(i = 0; i < apriv->framebuf_used; i++)
|
||||||
|
{
|
||||||
|
iaduration += apriv->framebuf[i].idur;
|
||||||
|
}
|
||||||
|
if(iaduration < iduration)
|
||||||
|
{
|
||||||
|
mp_msg(MSGT_MUXER, MSGL_DBG2, "Not enough audio data exit\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(as != NULL && (apriv->size == 0))
|
||||||
|
{
|
||||||
init_delay = vpriv->framebuf[0].pts - vpriv->framebuf[0].dts;
|
init_delay = vpriv->framebuf[0].pts - vpriv->framebuf[0].dts;
|
||||||
|
|
||||||
for(i = 0; i < apriv->framebuf_cnt; i++)
|
for(i = 0; i < apriv->framebuf_cnt; i++)
|
||||||
|
|
Loading…
Reference in New Issue