comparison libmpdemux/demuxer.c @ 17636:b849a99cdc3c

Second-try commit of this patch. 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything.

17635:db13b7295651

  else
    return vd;
}


int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
    demux_stream_t *d_audio=demuxer->audio;
    demux_stream_t *d_video=demuxer->video;
    sh_audio_t *sh_audio=d_audio->sh;
    sh_video_t *sh_video=d_video->sh;

    if(sh_audio) sh_audio->delay=0;
    if(sh_video) sh_video->timer=0; // !!!!!!
#endif

if (demuxer->desc->seek)
    demuxer->desc->seek(demuxer,rel_seek_secs,flags);

    if (sh_audio) resync_audio_stream(sh_audio);

return 1;
}

17636:b849a99cdc3c

  else
    return vd;
}


int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
    demux_stream_t *d_audio=demuxer->audio;
    demux_stream_t *d_video=demuxer->video;
    sh_audio_t *sh_audio=d_audio->sh;
    sh_video_t *sh_video=d_video->sh;

    if(sh_audio) sh_audio->delay=0;
    if(sh_video) sh_video->timer=0; // !!!!!!
#endif

if (demuxer->desc->seek)
    demuxer->desc->seek(demuxer,rel_seek_secs,audio_delay,flags);

    if (sh_audio) resync_audio_stream(sh_audio);

return 1;
}