RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
corey 2006-02-17 01:57:41 +00:00
parent 808ce9a03a
commit 1ab575101a
31 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/demux_aac.c
View File

@ -207,7 +207,7 @@ static int demux_aac_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
//This is an almost verbatim copy of high_res_mp3_seek(), from demux_audio.c
static void demux_aac_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
static void demux_aac_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
{
aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
demux_stream_t *d_audio=demuxer->audio;

2
libmpdemux/demux_asf.c
View File

@ -369,7 +369,7 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
extern void skip_audio_frame(sh_audio_t *sh_audio);
static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_seek_asf(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;

2
libmpdemux/demux_audio.c
View File

@ -476,7 +476,7 @@ static void high_res_mp3_seek(demuxer_t *demuxer,float time) {
}
}
static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
sh_audio_t* sh_audio;
stream_t* s;
int base,pos;

9
libmpdemux/demux_avi.c
View File

@ -618,7 +618,7 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){
//extern float initial_pts_delay;
void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
avi_priv_t *priv=demuxer->priv;
demux_stream_t *d_audio=demuxer->audio;
demux_stream_t *d_video=demuxer->video;
@ -706,8 +706,8 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
curr_audio_pos/=align;
curr_audio_pos*=align;
#else
curr_audio_pos=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
curr_audio_pos-=sh_audio->audio.dwStart;
/* immediate seeking to audio position, including when streams are delayed */
curr_audio_pos=(priv->avi_video_pts + audio_delay)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
curr_audio_pos*=sh_audio->audio.dwSampleSize;
#endif
@ -733,7 +733,8 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
} else {
// VBR audio
int chunks=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
/* immediate seeking to audio position, including when streams are delayed */
int chunks=(priv->avi_video_pts + audio_delay)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
audio_chunk_pos=0;
// find audio chunk pos:

2
libmpdemux/demux_avs.c
View File

@ -375,7 +375,7 @@ static void demux_close_avs(demuxer_t* demuxer)
}
}
static void demux_seek_avs(demuxer_t *demuxer, float rel_seek_secs,int flags)
static void demux_seek_avs(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
{
demux_stream_t *d_video=demuxer->video;
sh_video_t *sh_video=d_video->sh;

8
libmpdemux/demux_demuxers.c
View File

@ -57,7 +57,7 @@ static int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds) {
return 0;
}
static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags) {
static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags) {
dd_priv_t* priv;
float pos;
priv=demuxer->priv;
@ -66,13 +66,13 @@ static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags
priv->sd->stream->eof = 0;
// Seek video
demux_seek(priv->vd,rel_seek_secs,flags);
demux_seek(priv->vd,rel_seek_secs,audio_delay,flags);
// Get the new pos
pos = demuxer->video->pts;
if(priv->ad != priv->vd) {
sh_audio_t* sh = (sh_audio_t*)demuxer->audio->sh;
demux_seek(priv->ad,pos,1);
demux_seek(priv->ad,pos,audio_delay,1);
// In case the demuxer don't set pts
if(!demuxer->audio->pts)
demuxer->audio->pts = pos-((ds_tell_pts(demuxer->audio)-sh->a_in_buffer_len)/(float)sh->i_bps);
@ -80,7 +80,7 @@ static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags
}
if(priv->sd != priv->vd)
demux_seek(priv->sd,pos,1);
demux_seek(priv->sd,pos,audio_delay,1);
}

2
libmpdemux/demux_film.c
View File

@ -46,7 +46,7 @@ typedef struct _film_data_t
unsigned int film_version;
} film_data_t;
static void demux_seek_film(demuxer_t *demuxer, float rel_seek_secs, int flags)
static void demux_seek_film(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
{
film_data_t *film_data = (film_data_t *)demuxer->priv;
int new_current_chunk=(flags&1)?0:film_data->current_chunk;

2
libmpdemux/demux_fli.c
View File

@ -22,7 +22,7 @@ typedef struct _fli_frames_t {
unsigned int *frame_size;
} fli_frames_t;
static void demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
fli_frames_t *frames = (fli_frames_t *)demuxer->priv;
sh_video_t *sh_video = demuxer->video->sh;
int newpos=(flags&1)?0:frames->current_frame;

4
libmpdemux/demux_lavf.c
View File

@ -389,9 +389,9 @@ static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
return 1;
}
static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, int flags){
static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){
lavf_priv_t *priv = demuxer->priv;
mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_seek_lavf(%p, %f, %d)\n", demuxer, rel_seek_secs, flags);
mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_seek_lavf(%p, %f, %f, %d)\n", demuxer, rel_seek_secs, audio_delay, flags);
#if LIBAVFORMAT_BUILD < 4619
av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE);

2
libmpdemux/demux_mf.c
View File

@ -15,7 +15,7 @@
#include "stheader.h"
#include "mf.h"
static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
mf_t * mf = (mf_t *)demuxer->priv;
sh_video_t * sh_video = demuxer->video->sh;
int newpos = (flags & 1)?0:mf->curr_frame;

2
libmpdemux/demux_mov.c
View File

@ -2007,7 +2007,7 @@ if(trak->samplesize){
return pts;
}
static void demux_seek_mov(demuxer_t *demuxer,float pts,int flags){
static void demux_seek_mov(demuxer_t *demuxer,float pts,float audio_delay,int flags){
mov_priv_t* priv=demuxer->priv;
demux_stream_t* ds;
mov_track_t* trak;

2
libmpdemux/demux_mpc.c
View File

@ -153,7 +153,7 @@ static int demux_mpc_fill_buffer(demuxer_t *demux, demux_stream_t *ds) {
return 1;
}
static void demux_mpc_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_mpc_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
sh_audio_t* sh_audio = demuxer->audio->sh;
da_priv_t* priv = demuxer->priv;
stream_t* s = demuxer->stream;

2
libmpdemux/demux_mpg.c
View File

@ -676,7 +676,7 @@ do{
extern void skip_audio_frame(sh_audio_t *sh_audio);
void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){
void demux_seek_mpg(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;

2
libmpdemux/demux_nsv.c
View File

@ -34,7 +34,7 @@ typedef struct {
/**
* Seeking still to be implemented
*/
static void demux_seek_nsv ( demuxer_t *demuxer, float rel_seek_secs, int flags )
static void demux_seek_nsv ( demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags )
{
// seeking is not yet implemented
}

2
libmpdemux/demux_nuv.c
View File

@ -63,7 +63,7 @@ static int nearestBitrate(int bitrate) {
/**
* Seek to a position relative to the current position, indicated in time.
*/
static void demux_seek_nuv ( demuxer_t *demuxer, float rel_seek_secs, int flags )
static void demux_seek_nuv ( demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags )
{
#define MAX_TIME 1000000
nuv_priv_t* priv = demuxer->priv;

2
libmpdemux/demux_ogg.c
View File

@ -1422,7 +1422,7 @@ demuxer_t* init_avi_with_ogg(demuxer_t* demuxer) {
}
static void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,int flags) {
static void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags) {
ogg_demuxer_t* ogg_d = demuxer->priv;
ogg_sync_state* sync = &ogg_d->sync;
ogg_page* page= &ogg_d->page;

2
libmpdemux/demux_pva.c
View File

@ -466,7 +466,7 @@ int pva_get_payload(demuxer_t * d,pva_payload_t * payload)
return 1;
}
static void demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags)
static void demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,float audio_delay,int flags)
{
int total_bitrate=0;
off_t dest_offset;

2
libmpdemux/demux_rawaudio.c
View File

@ -79,7 +79,7 @@ static int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
return 1;
}
static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
stream_t* s = demuxer->stream;
sh_audio_t* sh_audio = demuxer->audio->sh;
off_t base,pos;

2
libmpdemux/demux_rawdv.c
View File

@ -36,7 +36,7 @@ typedef struct
dv_decoder_t *decoder;
} rawdv_frames_t;
static void demux_seek_rawdv(demuxer_t *demuxer,float rel_seek_secs,int flags)
static void demux_seek_rawdv(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags)
{
rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv;
sh_video_t *sh_video = demuxer->video->sh;

2
libmpdemux/demux_rawvideo.c
View File

@ -118,7 +118,7 @@ static int demux_rawvideo_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
return 1;
}
static void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
stream_t* s = demuxer->stream;
sh_video_t* sh_video = demuxer->video->sh;
off_t pos;

2
libmpdemux/demux_real.c
View File

@ -1825,7 +1825,7 @@ static void demux_close_real(demuxer_t *demuxer)
}
/* please upload RV10 samples WITH INDEX CHUNK */
static void demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, int flags)
static void demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
{
real_priv_t *priv = demuxer->priv;
demux_stream_t *d_audio = demuxer->audio;

2
libmpdemux/demux_realaud.c
View File

@ -341,7 +341,7 @@ static void demux_close_ra(demuxer_t *demuxer)
#if 0
/* please upload RV10 samples WITH INDEX CHUNK */
int demux_seek_ra(demuxer_t *demuxer, float rel_seek_secs, int flags)
int demux_seek_ra(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
{
real_priv_t *priv = demuxer->priv;
demux_stream_t *d_audio = demuxer->audio;

2
libmpdemux/demux_ts.c
View File

@ -3071,7 +3071,7 @@ extern int videobuf_code_len;
extern int sync_video_packet(demux_stream_t *);
extern int skip_video_packet(demux_stream_t *);
static void demux_seek_ts(demuxer_t *demuxer, float rel_seek_secs, int flags)
static void demux_seek_ts(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;

2
libmpdemux/demux_ty.c
View File

@ -1237,7 +1237,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
return( 1 );
}
static void demux_seek_ty( demuxer_t *demuxer, float rel_seek_secs, int flags )
static void demux_seek_ty( 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;

2
libmpdemux/demux_vqf.c
View File

@ -179,7 +179,7 @@ static int demux_vqf_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
return 1;
}
static void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
#if 0
stream_t* s = demuxer->stream;
sh_audio_t* sh_audio = demuxer->audio->sh;

2
libmpdemux/demux_xmms.c
View File

@ -297,7 +297,7 @@ static int demux_xmms_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
return 1;
}
static void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
static void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
stream_t* s = demuxer->stream;
sh_audio_t* sh_audio = demuxer->audio->sh;
xmms_priv_t *priv=demuxer->priv;

2
libmpdemux/demux_y4m.c
View File

@ -231,7 +231,7 @@ static demuxer_t* demux_open_y4m(demuxer_t* demuxer){
return demuxer;
}
static void demux_seek_y4m(demuxer_t *demuxer, float rel_seek_secs, int flags) {
static void demux_seek_y4m(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags) {
sh_video_t* sh = demuxer->video->sh;
y4m_priv_t* priv = demuxer->priv;
int rel_seek_frames = sh->fps*rel_seek_secs;

4
libmpdemux/demuxer.c
View File

@ -859,7 +859,7 @@ demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int
}
int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
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;
@ -893,7 +893,7 @@ if(!demuxer->seekable){
#endif
if (demuxer->desc->seek)
demuxer->desc->seek(demuxer,rel_seek_secs,flags);
demuxer->desc->seek(demuxer,rel_seek_secs,audio_delay,flags);
if (sh_audio) resync_audio_stream(sh_audio);

4
libmpdemux/demuxer.h
View File

@ -151,7 +151,7 @@ typedef struct demuxers_desc_st {
/// Close the demuxer
void (*close)(struct demuxer_st *demuxer); ///< Optional
// Seek
void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, int flags); ///< Optional
void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional
// Control
int (*control)(struct demuxer_st *demuxer, int cmd, void *arg); ///< Optional
} demuxer_desc_t;
@ -306,7 +306,7 @@ static inline int avi_stream_id(unsigned int id){
}
demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid,char* filename);
int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags);
demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd);
// AVI demuxer params:

6
mencoder.c
View File

@ -1037,12 +1037,12 @@ if (seek_to_sec) {
else
sscanf(seek_to_sec, "%f", &d);
demux_seek(demuxer, d, 1);
demux_seek(demuxer, d, audio_delay, 1);
// there is 2 way to handle the -ss option in 3-pass mode:
// > 1. do the first pass for the whole file, and use -ss for 2nd/3rd pases only
// > 2. do all the 3 passes with the same -ss value
// this line enables behaviour 1. (and kills 2. at the same time):
// if(demuxer2) demux_seek(demuxer2, d, 1);
// if(demuxer2) demux_seek(demuxer2, d, audio_delay, 1);
}
if (out_file_format == MUXER_TYPE_MPEG)
@ -1770,7 +1770,7 @@ static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_st
if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do...
if (!edl_seek_type) {
if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, 0)){
if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, audio_delay, 0)){
sh_video->pts = demuxer->video->pts;
//if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts);
resync_video_stream(sh_video);

2
mplayer.c
View File

@ -4185,7 +4185,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if(rel_seek_secs || abs_seek_pos){
current_module="seek";
if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){
if(demux_seek(demuxer,rel_seek_secs,audio_delay,abs_seek_pos)){
// success:
/* FIXME there should be real seeking for vobsub */
if(sh_video) sh_video->pts=d_video->pts;