2001-08-11 20:37:33 +00:00
|
|
|
// AVI file parser for DEMUXER v2.9 by A'rpi/ESP-team
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-04-23 03:42:17 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2001-08-01 09:14:02 +00:00
|
|
|
#include <unistd.h>
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-08-17 00:40:25 +00:00
|
|
|
#include "config.h"
|
|
|
|
#include "mp_msg.h"
|
2001-09-26 21:35:14 +00:00
|
|
|
#include "help_mp.h"
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-04-23 03:42:17 +00:00
|
|
|
#include "stream.h"
|
|
|
|
#include "demuxer.h"
|
|
|
|
|
|
|
|
#include "wine/mmreg.h"
|
|
|
|
#include "wine/avifmt.h"
|
|
|
|
#include "wine/vfw.h"
|
|
|
|
|
|
|
|
#include "codec-cfg.h"
|
|
|
|
#include "stheader.h"
|
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
#include "aviheader.h"
|
2001-02-24 20:28:24 +00:00
|
|
|
|
|
|
|
// Select ds from ID
|
2001-04-23 03:42:17 +00:00
|
|
|
demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
|
2001-02-24 20:28:24 +00:00
|
|
|
int stream_id=avi_stream_id(id);
|
2001-04-15 03:40:37 +00:00
|
|
|
|
|
|
|
// printf("demux_avi_select_stream(%d) {a:%d/v:%d}\n",stream_id,
|
|
|
|
// demux->audio->id,demux->video->id);
|
|
|
|
|
|
|
|
if(demux->video->id==-1)
|
2001-04-23 03:42:17 +00:00
|
|
|
if(demux->v_streams[stream_id])
|
2001-04-15 03:40:37 +00:00
|
|
|
demux->video->id=stream_id;
|
|
|
|
|
|
|
|
if(demux->audio->id==-1)
|
2001-04-23 03:42:17 +00:00
|
|
|
if(demux->a_streams[stream_id])
|
2001-04-15 03:40:37 +00:00
|
|
|
demux->audio->id=stream_id;
|
|
|
|
|
|
|
|
if(stream_id==demux->audio->id){
|
|
|
|
if(!demux->audio->sh){
|
2001-04-23 03:42:17 +00:00
|
|
|
demux->audio->sh=demux->a_streams[stream_id];
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected AVI audio ID = %d\n",demux->audio->id);
|
2001-04-15 03:40:37 +00:00
|
|
|
}
|
|
|
|
return demux->audio;
|
|
|
|
}
|
|
|
|
if(stream_id==demux->video->id){
|
|
|
|
if(!demux->video->sh){
|
2001-04-23 03:42:17 +00:00
|
|
|
demux->video->sh=demux->v_streams[stream_id];
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected AVI video ID = %d\n",demux->video->id);
|
2001-04-15 03:40:37 +00:00
|
|
|
}
|
|
|
|
return demux->video;
|
|
|
|
}
|
2001-02-24 20:28:24 +00:00
|
|
|
if(id!=mmioFOURCC('J','U','N','K')){
|
|
|
|
// unknown
|
2001-09-27 20:36:19 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_DBG2,"Unknown chunk: %.4s (%X)\n",(char *) &id,id);
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2001-06-03 23:37:20 +00:00
|
|
|
static int demux_avi_read_packet(demuxer_t *demux,unsigned int id,unsigned int len,int idxpos,int flags){
|
2001-08-11 20:37:33 +00:00
|
|
|
avi_priv_t *priv=demux->priv;
|
2001-02-24 20:28:24 +00:00
|
|
|
int skip;
|
|
|
|
float pts=0;
|
|
|
|
demux_stream_t *ds=demux_avi_select_stream(demux,id);
|
|
|
|
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_dbg(MSGT_DEMUX,MSGL_DBG3,"demux_avi.read_packet: %X\n",id);
|
2001-02-24 20:28:24 +00:00
|
|
|
|
|
|
|
if(ds==demux->audio){
|
2001-08-06 23:59:22 +00:00
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
if(priv->pts_corrected==0){
|
|
|
|
// printf("\rYYY-A A: %5.3f V: %5.3f \n",priv->avi_audio_pts,priv->avi_video_pts);
|
|
|
|
if(priv->pts_has_video){
|
2001-08-06 23:59:22 +00:00
|
|
|
// we have video pts now
|
2001-08-11 20:37:33 +00:00
|
|
|
float delay=(float)priv->pts_corr_bytes/((sh_audio_t*)(ds->sh))->wf->nAvgBytesPerSec;
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"XXX initial v_pts=%5.3f a_pos=%d (%5.3f) \n",priv->avi_audio_pts,priv->pts_corr_bytes,delay);
|
2001-08-11 20:37:33 +00:00
|
|
|
//priv->pts_correction=-priv->avi_audio_pts+delay;
|
|
|
|
priv->pts_correction=delay-priv->avi_audio_pts;
|
|
|
|
priv->avi_audio_pts+=priv->pts_correction;
|
|
|
|
priv->pts_corrected=1;
|
2001-08-06 23:59:22 +00:00
|
|
|
} else
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->pts_corr_bytes+=len;
|
2001-08-06 23:59:22 +00:00
|
|
|
}
|
2001-08-11 20:37:33 +00:00
|
|
|
pts=priv->avi_audio_pts; //+priv->pts_correction;
|
|
|
|
priv->avi_audio_pts=0;
|
2001-02-24 20:28:24 +00:00
|
|
|
} else
|
2001-07-29 01:28:07 +00:00
|
|
|
if(ds==demux->video){
|
2001-02-24 20:28:24 +00:00
|
|
|
// video
|
2001-08-11 20:37:33 +00:00
|
|
|
if(priv->skip_video_frames>0){
|
2001-02-24 20:28:24 +00:00
|
|
|
// drop frame (seeking)
|
2001-08-11 20:37:33 +00:00
|
|
|
--priv->skip_video_frames;
|
2001-02-24 20:28:24 +00:00
|
|
|
ds=NULL;
|
2001-08-12 20:52:35 +00:00
|
|
|
// } else {
|
|
|
|
// pts=priv->avi_video_pts;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
// ezt a 2 sort lehet hogy fell kell majd cserelni:
|
2001-08-11 20:37:33 +00:00
|
|
|
//priv->avi_video_pts+=avi_pts_frametime;
|
|
|
|
//priv->avi_video_pts+=(float)avi_header.video.dwScale/(float)avi_header.video.dwRate;
|
|
|
|
//priv->avi_video_pts+=((sh_video_t*)ds->sh)->frametime;
|
2001-04-23 03:42:17 +00:00
|
|
|
// FIXME!!!
|
2001-07-21 00:10:09 +00:00
|
|
|
#if 1
|
|
|
|
// printf("ds=0x%X\n",ds);
|
|
|
|
// printf("packno=%d\n",ds->pack_no);
|
2001-07-29 01:28:07 +00:00
|
|
|
// printf("### pack_no=%d\n",demux->video->pack_no+demux->video->packs);
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->avi_video_pts = (demux->video->pack_no+demux->video->packs) *
|
2001-07-21 00:10:09 +00:00
|
|
|
(float)((sh_video_t*)demux->video->sh)->video.dwScale /
|
|
|
|
(float)((sh_video_t*)demux->video->sh)->video.dwRate;
|
|
|
|
#else
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->avi_video_pts+=(float)((sh_video_t*)(demux->video->sh))->video.dwScale/(float)((sh_video_t*)(demux->video->sh))->video.dwRate;
|
|
|
|
// priv->avi_video_pts+=avi_video_ftime;
|
2001-07-21 00:10:09 +00:00
|
|
|
#endif
|
2001-08-11 20:37:33 +00:00
|
|
|
// printf("\rYYY-V A: %5.3f V: %5.3f \n",priv->avi_audio_pts,priv->avi_video_pts);
|
|
|
|
priv->avi_audio_pts=priv->avi_video_pts+priv->pts_correction;
|
|
|
|
priv->pts_has_video=1;
|
2001-08-06 23:59:22 +00:00
|
|
|
|
2001-08-12 20:52:35 +00:00
|
|
|
pts=priv->avi_video_pts;
|
|
|
|
|
|
|
|
//printf("read pack_no: %d pts %5.3f \n",demux->video->pack_no+demux->video->packs,pts);
|
|
|
|
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// len=stream_read_dword_le(demux->stream);
|
|
|
|
skip=(len+1)&(~1); // total bytes in this chunk
|
|
|
|
|
|
|
|
if(ds){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Read %d data bytes from packet %04X\n",len,id);
|
2001-06-03 23:37:20 +00:00
|
|
|
ds_read_packet(ds,demux->stream,len,pts,idxpos,flags);
|
2001-02-24 20:28:24 +00:00
|
|
|
skip-=len;
|
|
|
|
}
|
|
|
|
if(skip){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Skipping %d bytes from packet %04X\n",skip,id);
|
2001-02-24 20:28:24 +00:00
|
|
|
stream_skip(demux->stream,skip);
|
|
|
|
}
|
|
|
|
return ds?1:0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// return value:
|
|
|
|
// 0 = EOF or no stream found
|
|
|
|
// 1 = successfully read a packet
|
|
|
|
int demux_avi_fill_buffer(demuxer_t *demux){
|
2001-08-11 20:37:33 +00:00
|
|
|
avi_priv_t *priv=demux->priv;
|
2001-02-24 20:28:24 +00:00
|
|
|
unsigned int id=0;
|
|
|
|
unsigned int len;
|
|
|
|
int max_packs=128;
|
|
|
|
int ret=0;
|
|
|
|
|
|
|
|
do{
|
2001-06-03 23:37:20 +00:00
|
|
|
int flags=0;
|
2001-02-24 20:28:24 +00:00
|
|
|
AVIINDEXENTRY *idx=NULL;
|
2001-07-29 21:07:34 +00:00
|
|
|
#if 0
|
2001-02-24 20:28:24 +00:00
|
|
|
demux->filepos=stream_tell(demux->stream);
|
2001-04-23 03:42:17 +00:00
|
|
|
if(demux->filepos>=demux->movi_end){
|
2001-02-24 20:28:24 +00:00
|
|
|
demux->stream->eof=1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if(stream_eof(demux->stream)) return 0;
|
2001-07-29 21:07:34 +00:00
|
|
|
#endif
|
2001-08-11 20:37:33 +00:00
|
|
|
if(priv->idx_size>0 && priv->idx_pos<priv->idx_size){
|
2001-02-24 20:28:24 +00:00
|
|
|
unsigned int pos;
|
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
//if(priv->idx_pos<0) printf("Fatal! idx_pos=%d\n",priv->idx_pos);
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
idx=&((AVIINDEXENTRY *)priv->idx)[priv->idx_pos++];
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
//printf("[%d]",priv->idx_pos);fflush(stdout);
|
2001-02-24 20:28:24 +00:00
|
|
|
|
|
|
|
//stream_seek(demux->stream,idx.dwChunkOffset);
|
|
|
|
//printf("IDX pos=%X idx.pos=%X idx.size=%X idx.flags=%X\n",demux->filepos,
|
|
|
|
// pos-4,idx->dwChunkLength,idx->dwFlags);
|
|
|
|
if(idx->dwFlags&AVIIF_LIST){
|
|
|
|
// LIST
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if(!demux_avi_select_stream(demux,idx->ckid)){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_dbg(MSGT_DEMUX,MSGL_DBG3,"Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
|
2001-02-24 20:28:24 +00:00
|
|
|
continue; // skip this chunk
|
|
|
|
}
|
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
pos=idx->dwChunkOffset+priv->idx_offset;
|
2001-04-23 03:42:17 +00:00
|
|
|
if(pos<demux->movi_start || pos>=demux->movi_end){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos);
|
2001-02-24 20:28:24 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
if(pos!=demux->filepos){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"Warning! pos=0x%X idx.pos=0x%X diff=%d \n",demux->filepos,pos,pos-demux->filepos);
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
stream_seek(demux->stream,pos);
|
2001-07-29 21:07:34 +00:00
|
|
|
demux->filepos=stream_tell(demux->stream);
|
2001-02-24 20:28:24 +00:00
|
|
|
id=stream_read_dword_le(demux->stream);
|
2001-07-29 21:07:34 +00:00
|
|
|
if(stream_eof(demux->stream)) return 0; // EOF!
|
|
|
|
|
2001-02-24 20:28:24 +00:00
|
|
|
if(id!=idx->ckid){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
|
2001-08-08 15:20:40 +00:00
|
|
|
id=idx->ckid;
|
|
|
|
// continue;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
len=stream_read_dword_le(demux->stream);
|
|
|
|
// if((len&(~1))!=(idx->dwChunkLength&(~1))){
|
|
|
|
// if((len)!=(idx->dwChunkLength)){
|
|
|
|
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
|
2001-08-08 15:20:40 +00:00
|
|
|
len=idx->dwChunkLength;
|
|
|
|
// continue;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
2001-06-03 23:37:20 +00:00
|
|
|
if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
|
2001-02-24 20:28:24 +00:00
|
|
|
} else {
|
2001-07-29 21:07:34 +00:00
|
|
|
demux->filepos=stream_tell(demux->stream);
|
|
|
|
if(demux->filepos>=demux->movi_end){
|
|
|
|
demux->stream->eof=1;
|
|
|
|
return 0;
|
|
|
|
}
|
2001-02-24 20:28:24 +00:00
|
|
|
id=stream_read_dword_le(demux->stream);
|
|
|
|
len=stream_read_dword_le(demux->stream);
|
2001-07-29 21:07:34 +00:00
|
|
|
if(stream_eof(demux->stream)) return 0; // EOF!
|
|
|
|
|
2001-02-24 20:28:24 +00:00
|
|
|
if(id==mmioFOURCC('L','I','S','T')){
|
|
|
|
id=stream_read_dword_le(demux->stream); // list type
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2001-08-11 20:37:33 +00:00
|
|
|
ret=demux_avi_read_packet(demux,id,len,priv->idx_pos-1,flags);
|
2001-09-27 20:36:19 +00:00
|
|
|
// if(!ret && priv->skip_video_frames<=0)
|
|
|
|
// if(--max_packs==0){
|
|
|
|
// demux->stream->eof=1;
|
|
|
|
// mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_DoesntContainSelectedStream);
|
|
|
|
// return 0;
|
|
|
|
// }
|
2001-02-24 20:28:24 +00:00
|
|
|
} while(ret!=1);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// return value:
|
|
|
|
// 0 = EOF or no stream found
|
|
|
|
// 1 = successfully read a packet
|
|
|
|
int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t* ds){
|
2001-08-11 20:37:33 +00:00
|
|
|
avi_priv_t *priv=demux->priv;
|
2001-02-24 20:28:24 +00:00
|
|
|
unsigned int id=0;
|
|
|
|
unsigned int len;
|
|
|
|
int max_packs=128;
|
|
|
|
int ret=0;
|
|
|
|
|
|
|
|
do{
|
2001-06-03 23:37:20 +00:00
|
|
|
int flags=0;
|
2001-02-24 20:28:24 +00:00
|
|
|
AVIINDEXENTRY *idx=NULL;
|
|
|
|
int idx_pos=0;
|
|
|
|
demux->filepos=stream_tell(demux->stream);
|
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
if(ds==demux->video) idx_pos=priv->idx_pos_v++; else
|
|
|
|
if(ds==demux->audio) idx_pos=priv->idx_pos_a++; else
|
|
|
|
idx_pos=priv->idx_pos++;
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
if(priv->idx_size>0 && idx_pos<priv->idx_size){
|
2001-02-24 20:28:24 +00:00
|
|
|
unsigned int pos;
|
2001-08-11 20:37:33 +00:00
|
|
|
idx=&((AVIINDEXENTRY *)priv->idx)[idx_pos];
|
|
|
|
// idx=&priv->idx[idx_pos];
|
2001-02-24 20:28:24 +00:00
|
|
|
|
|
|
|
if(idx->dwFlags&AVIIF_LIST){
|
|
|
|
// LIST
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_dbg(MSGT_DEMUX,MSGL_DBG3,"Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
|
2001-02-24 20:28:24 +00:00
|
|
|
continue; // skip this chunk
|
|
|
|
}
|
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
pos=idx->dwChunkOffset+priv->idx_offset;
|
2001-04-23 03:42:17 +00:00
|
|
|
if(pos<demux->movi_start || pos>=demux->movi_end){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%X idx=0x%X \n",demux->filepos,pos);
|
2001-02-24 20:28:24 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
if(pos!=demux->filepos){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"Warning! pos=0x%X idx.pos=0x%X diff=%d \n",demux->filepos,pos,pos-demux->filepos);
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
stream_seek(demux->stream,pos);
|
|
|
|
|
|
|
|
id=stream_read_dword_le(demux->stream);
|
|
|
|
|
|
|
|
if(stream_eof(demux->stream)) return 0;
|
|
|
|
|
|
|
|
if(id!=idx->ckid){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
|
2001-08-08 15:20:40 +00:00
|
|
|
id=idx->ckid;
|
|
|
|
// continue;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
len=stream_read_dword_le(demux->stream);
|
|
|
|
// if((len&(~1))!=(idx->dwChunkLength&(~1))){
|
|
|
|
// if((len)!=(idx->dwChunkLength)){
|
|
|
|
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
|
2001-08-08 15:20:40 +00:00
|
|
|
len=idx->dwChunkLength;
|
|
|
|
// continue;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
2001-06-03 23:37:20 +00:00
|
|
|
if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
|
2001-02-24 20:28:24 +00:00
|
|
|
} else return 0;
|
2001-06-03 23:37:20 +00:00
|
|
|
ret=demux_avi_read_packet(demux,id,len,idx_pos,flags);
|
2001-09-27 20:36:19 +00:00
|
|
|
// if(!ret && priv->skip_video_frames<=0)
|
|
|
|
// if(--max_packs==0){
|
|
|
|
// demux->stream->eof=1;
|
|
|
|
// mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_DoesntContainSelectedStream);
|
|
|
|
// return 0;
|
|
|
|
// }
|
2001-02-24 20:28:24 +00:00
|
|
|
} while(ret!=1);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// return value:
|
|
|
|
// 0 = EOF or no stream found
|
|
|
|
// 1 = successfully read a packet
|
|
|
|
int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t* ds){
|
2001-08-11 20:37:33 +00:00
|
|
|
avi_priv_t *priv=demux->priv;
|
2001-02-24 20:28:24 +00:00
|
|
|
unsigned int id=0;
|
|
|
|
unsigned int len;
|
|
|
|
int ret=0;
|
|
|
|
int *fpos=NULL;
|
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
if(ds==demux->video) fpos=&priv->idx_pos_v; else
|
|
|
|
if(ds==demux->audio) fpos=&priv->idx_pos_a; else
|
2001-02-24 20:28:24 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
stream_seek(demux->stream,fpos[0]);
|
|
|
|
|
|
|
|
do{
|
|
|
|
|
|
|
|
demux->filepos=stream_tell(demux->stream);
|
2001-04-23 03:42:17 +00:00
|
|
|
if(demux->filepos>=demux->movi_end){
|
2001-02-24 20:28:24 +00:00
|
|
|
demux->stream->eof=1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if(stream_eof(demux->stream)) return 0;
|
|
|
|
|
|
|
|
id=stream_read_dword_le(demux->stream);
|
|
|
|
len=stream_read_dword_le(demux->stream);
|
|
|
|
if(id==mmioFOURCC('L','I','S','T')){
|
|
|
|
id=stream_read_dword_le(demux->stream); // list type
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ds==demux_avi_select_stream(demux,id)){
|
|
|
|
// read it!
|
2001-08-11 20:37:33 +00:00
|
|
|
ret=demux_avi_read_packet(demux,id,len,priv->idx_pos-1,0);
|
2001-02-24 20:28:24 +00:00
|
|
|
} else {
|
|
|
|
// skip it!
|
|
|
|
int skip=(len+1)&(~1); // total bytes in this chunk
|
|
|
|
stream_skip(demux->stream,skip);
|
|
|
|
}
|
|
|
|
|
|
|
|
} while(ret!=1);
|
|
|
|
fpos[0]=stream_tell(demux->stream);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2001-08-12 15:46:09 +00:00
|
|
|
//extern int audio_id;
|
|
|
|
//extern int video_id;
|
2001-08-11 20:37:33 +00:00
|
|
|
extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index
|
|
|
|
extern int force_ni;
|
|
|
|
extern int pts_from_bps;
|
|
|
|
|
2001-10-02 21:45:41 +00:00
|
|
|
void read_avi_header(demuxer_t *demuxer,int index_mode);
|
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
demuxer_t* demux_open_avi(demuxer_t* demuxer){
|
|
|
|
demux_stream_t *d_audio=demuxer->audio;
|
|
|
|
demux_stream_t *d_video=demuxer->video;
|
|
|
|
sh_audio_t *sh_audio=NULL;
|
|
|
|
sh_video_t *sh_video=NULL;
|
|
|
|
avi_priv_t* priv=malloc(sizeof(avi_priv_t));
|
|
|
|
|
|
|
|
// priv struct:
|
|
|
|
priv->avi_audio_pts=priv->avi_video_pts=0.0f;
|
|
|
|
priv->pts_correction=0.0f;
|
|
|
|
priv->skip_video_frames=0;
|
|
|
|
priv->pts_corr_bytes=0;
|
|
|
|
priv->pts_has_video=priv->pts_corrected=0;
|
|
|
|
demuxer->priv=(void*)priv;
|
|
|
|
|
|
|
|
//---- AVI header:
|
|
|
|
read_avi_header(demuxer,(demuxer->stream->type!=STREAMTYPE_STREAM)?index_mode:-2);
|
|
|
|
stream_reset(demuxer->stream);
|
|
|
|
stream_seek(demuxer->stream,demuxer->movi_start);
|
|
|
|
priv->idx_pos=0;
|
|
|
|
priv->idx_pos_a=0;
|
|
|
|
priv->idx_pos_v=0;
|
|
|
|
if(priv->idx_size>0){
|
|
|
|
// decide index format:
|
|
|
|
if(((AVIINDEXENTRY *)priv->idx)[0].dwChunkOffset<demuxer->movi_start)
|
|
|
|
priv->idx_offset=demuxer->movi_start-4;
|
|
|
|
else
|
|
|
|
priv->idx_offset=0;
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"AVI index offset: %d\n",priv->idx_offset);
|
2001-08-11 20:37:33 +00:00
|
|
|
}
|
|
|
|
// demuxer->endpos=avi_header.movi_end;
|
|
|
|
|
|
|
|
if(priv->idx_size>0){
|
|
|
|
// check that file is non-interleaved:
|
|
|
|
int i;
|
|
|
|
int a_pos=-1;
|
|
|
|
int v_pos=-1;
|
|
|
|
for(i=0;i<priv->idx_size;i++){
|
|
|
|
AVIINDEXENTRY* idx=&((AVIINDEXENTRY *)priv->idx)[i];
|
|
|
|
demux_stream_t* ds=demux_avi_select_stream(demuxer,idx->ckid);
|
|
|
|
int pos=idx->dwChunkOffset+priv->idx_offset;
|
|
|
|
if(a_pos==-1 && ds==demuxer->audio){
|
|
|
|
a_pos=pos;
|
|
|
|
if(v_pos!=-1) break;
|
|
|
|
}
|
|
|
|
if(v_pos==-1 && ds==demuxer->video){
|
|
|
|
v_pos=pos;
|
|
|
|
if(a_pos!=-1) break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(v_pos==-1){
|
2001-09-26 21:35:14 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI_NI: " MSGTR_MissingVideoStream);
|
2001-08-11 20:37:33 +00:00
|
|
|
return NULL;
|
|
|
|
// GUI_MSG( mplErrorAVINI )
|
|
|
|
}
|
|
|
|
if(a_pos==-1){
|
2001-09-26 21:35:14 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI_NI: " MSGTR_MissingAudioStream);
|
2001-08-11 20:37:33 +00:00
|
|
|
sh_audio=NULL;
|
|
|
|
} else {
|
|
|
|
if(force_ni || abs(a_pos-v_pos)>0x100000){ // distance > 1MB
|
2001-09-26 21:35:14 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_INFO,MSGTR_NI_Message,force_ni?MSGTR_NI_Forced:MSGTR_NI_Detected);
|
2001-08-11 20:37:33 +00:00
|
|
|
demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
|
|
|
|
pts_from_bps=1; // force BPS sync!
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// no index
|
|
|
|
if(force_ni){
|
2001-09-26 21:35:14 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_INFO,MSGTR_UsingNINI);
|
2001-08-11 20:37:33 +00:00
|
|
|
demuxer->type=DEMUXER_TYPE_AVI_NINI; // HACK!!!!
|
|
|
|
priv->idx_pos_a=
|
|
|
|
priv->idx_pos_v=demuxer->movi_start;
|
|
|
|
pts_from_bps=1; // force BPS sync!
|
|
|
|
}
|
2001-08-22 16:42:37 +00:00
|
|
|
demuxer->seekable=0;
|
2001-08-11 20:37:33 +00:00
|
|
|
}
|
|
|
|
if(!ds_fill_buffer(d_video)){
|
2001-09-26 21:35:14 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI: " MSGTR_MissingVideoStreamBug);
|
2001-08-11 20:37:33 +00:00
|
|
|
return NULL;
|
|
|
|
// GUI_MSG( mplAVIErrorMissingVideoStream )
|
|
|
|
}
|
|
|
|
sh_video=d_video->sh;sh_video->ds=d_video;
|
2001-08-12 15:46:09 +00:00
|
|
|
if(d_audio->id!=-2){
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"AVI: Searching for audio stream (id:%d)\n",d_audio->id);
|
2001-08-11 20:37:33 +00:00
|
|
|
if(!ds_fill_buffer(d_audio)){
|
2001-09-26 21:35:14 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI: " MSGTR_MissingAudioStream);
|
2001-08-11 20:37:33 +00:00
|
|
|
sh_audio=NULL;
|
|
|
|
} else {
|
|
|
|
sh_audio=d_audio->sh;sh_audio->ds=d_audio;
|
|
|
|
sh_audio->format=sh_audio->wf->wFormatTag;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// calc. FPS:
|
|
|
|
sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
|
|
|
|
sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
|
|
|
|
// calculating video bitrate:
|
|
|
|
sh_video->i_bps=demuxer->movi_end-demuxer->movi_start-priv->idx_size*8;
|
|
|
|
if(sh_audio) sh_video->i_bps-=sh_audio->audio.dwLength;
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_V,"AVI video length=%d\n",sh_video->i_bps);
|
2001-08-11 20:37:33 +00:00
|
|
|
sh_video->i_bps=((float)sh_video->i_bps/(float)sh_video->video.dwLength)*sh_video->fps;
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n",
|
2001-08-11 20:37:33 +00:00
|
|
|
(char *)&sh_video->bih->biCompression,
|
|
|
|
sh_video->bih->biWidth,
|
|
|
|
sh_video->bih->biHeight,
|
|
|
|
sh_video->bih->biBitCount,
|
|
|
|
sh_video->fps,
|
|
|
|
sh_video->i_bps*0.008f,
|
|
|
|
sh_video->i_bps/1024.0f );
|
|
|
|
|
|
|
|
return demuxer;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//extern float initial_pts_delay;
|
2001-08-08 19:37:45 +00:00
|
|
|
|
|
|
|
void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
|
2001-08-11 20:37:33 +00:00
|
|
|
avi_priv_t *priv=demuxer->priv;
|
2001-08-08 19:37:45 +00:00
|
|
|
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;
|
|
|
|
float skip_audio_secs=0;
|
|
|
|
|
|
|
|
//FIXME: OFF_T - Didn't check AVI case yet (avi files can't be >2G anyway?)
|
|
|
|
//================= seek in AVI ==========================
|
|
|
|
int rel_seek_frames=rel_seek_secs*sh_video->fps;
|
|
|
|
int video_chunk_pos=d_video->pos;
|
|
|
|
int i;
|
2001-08-22 19:03:15 +00:00
|
|
|
|
|
|
|
if(flags&1){
|
|
|
|
// seek absolute
|
|
|
|
video_chunk_pos=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(flags&2){
|
|
|
|
// float 0..1
|
|
|
|
int total=sh_video->video.dwLength;
|
|
|
|
if(total<=1){
|
|
|
|
// bad video header, try to get it from audio
|
2001-08-28 22:24:02 +00:00
|
|
|
if(sh_audio) total=sh_video->fps*sh_audio->audio.dwLength/sh_audio->wf->nAvgBytesPerSec;
|
|
|
|
if(total<=1){
|
2001-09-26 21:35:14 +00:00
|
|
|
mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CouldntDetFNo);
|
2001-08-22 19:03:15 +00:00
|
|
|
total=0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rel_seek_frames=rel_seek_secs*total;
|
|
|
|
}
|
2001-08-08 19:37:45 +00:00
|
|
|
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->skip_video_frames=0;
|
|
|
|
priv->avi_audio_pts=0;
|
2001-08-08 19:37:45 +00:00
|
|
|
|
2001-08-11 00:53:45 +00:00
|
|
|
// ------------ STEP 1: find nearest video keyframe chunk ------------
|
2001-08-08 19:37:45 +00:00
|
|
|
// find nearest video keyframe chunk pos:
|
|
|
|
if(rel_seek_frames>0){
|
|
|
|
// seek forward
|
2001-08-11 20:37:33 +00:00
|
|
|
while(video_chunk_pos<priv->idx_size){
|
|
|
|
int id=((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].ckid;
|
2001-08-08 19:37:45 +00:00
|
|
|
if(avi_stream_id(id)==d_video->id){ // video frame
|
2001-08-11 20:37:33 +00:00
|
|
|
if((--rel_seek_frames)<0 && ((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
|
2001-08-08 19:37:45 +00:00
|
|
|
}
|
|
|
|
++video_chunk_pos;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// seek backward
|
2001-08-12 20:52:35 +00:00
|
|
|
while(video_chunk_pos>0){
|
2001-08-11 20:37:33 +00:00
|
|
|
int id=((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].ckid;
|
2001-08-08 19:37:45 +00:00
|
|
|
if(avi_stream_id(id)==d_video->id){ // video frame
|
2001-08-11 20:37:33 +00:00
|
|
|
if((++rel_seek_frames)>0 && ((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
|
2001-08-08 19:37:45 +00:00
|
|
|
}
|
|
|
|
--video_chunk_pos;
|
|
|
|
}
|
|
|
|
}
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->idx_pos_a=priv->idx_pos_v=priv->idx_pos=video_chunk_pos;
|
2001-08-08 19:37:45 +00:00
|
|
|
|
|
|
|
// re-calc video pts:
|
|
|
|
d_video->pack_no=0;
|
|
|
|
for(i=0;i<video_chunk_pos;i++){
|
2001-08-11 20:37:33 +00:00
|
|
|
int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
|
2001-08-08 19:37:45 +00:00
|
|
|
if(avi_stream_id(id)==d_video->id) ++d_video->pack_no;
|
|
|
|
}
|
2001-08-16 01:03:51 +00:00
|
|
|
sh_video->num_frames=sh_video->num_frames_decoded=d_video->pack_no;
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
|
2001-08-11 00:53:45 +00:00
|
|
|
d_video->pos=video_chunk_pos;
|
2001-08-12 20:52:35 +00:00
|
|
|
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_SEEK,MSGL_DBG2,"V_SEEK: pack=%d pts=%5.3f chunk=%d \n",d_video->pack_no,priv->avi_video_pts,video_chunk_pos);
|
2001-08-11 00:53:45 +00:00
|
|
|
|
|
|
|
// ------------ STEP 2: seek audio, find the right chunk & pos ------------
|
|
|
|
|
|
|
|
d_audio->pack_no=0;
|
|
|
|
d_audio->dpos=0;
|
2001-08-08 19:37:45 +00:00
|
|
|
|
|
|
|
if(sh_audio){
|
|
|
|
int i;
|
2001-08-11 00:53:45 +00:00
|
|
|
// int apos=0;
|
2001-08-08 19:37:45 +00:00
|
|
|
int last=0;
|
|
|
|
int len=0;
|
|
|
|
int skip_audio_bytes=0;
|
2001-08-11 00:53:45 +00:00
|
|
|
int curr_audio_pos=-1;
|
|
|
|
int audio_chunk_pos=-1;
|
2001-08-11 20:37:33 +00:00
|
|
|
int chunk_max=(demuxer->type==DEMUXER_TYPE_AVI)?video_chunk_pos:priv->idx_size;
|
2001-08-11 00:53:45 +00:00
|
|
|
|
|
|
|
if(sh_audio->audio.dwSampleSize){
|
|
|
|
// constant rate audio stream
|
|
|
|
#if 0
|
|
|
|
int align;
|
2001-08-11 20:37:33 +00:00
|
|
|
curr_audio_pos=(priv->avi_video_pts) * sh_audio->wf->nAvgBytesPerSec;
|
2001-08-11 00:53:45 +00:00
|
|
|
if(curr_audio_pos<0)curr_audio_pos=0;
|
|
|
|
align=sh_audio->audio.dwSampleSize;
|
|
|
|
if(sh_audio->wf->nBlockAlign>align) align=sh_audio->wf->nBlockAlign;
|
|
|
|
curr_audio_pos/=align;
|
|
|
|
curr_audio_pos*=align;
|
2001-08-08 19:37:45 +00:00
|
|
|
#else
|
2001-08-11 20:37:33 +00:00
|
|
|
curr_audio_pos=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
|
2001-08-11 00:53:45 +00:00
|
|
|
curr_audio_pos*=sh_audio->audio.dwSampleSize;
|
2001-08-08 19:37:45 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// find audio chunk pos:
|
2001-08-11 00:53:45 +00:00
|
|
|
for(i=0;i<chunk_max;i++){
|
2001-08-11 20:37:33 +00:00
|
|
|
int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
|
2001-08-08 19:37:45 +00:00
|
|
|
if(avi_stream_id(id)==d_audio->id){
|
2001-08-11 20:37:33 +00:00
|
|
|
len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
|
2001-08-11 00:53:45 +00:00
|
|
|
audio_chunk_pos=i; ++d_audio->pack_no;
|
|
|
|
if(d_audio->dpos<=curr_audio_pos && curr_audio_pos<(d_audio->dpos+len)){
|
|
|
|
//if(verbose)printf("break;\n");
|
2001-08-08 19:37:45 +00:00
|
|
|
break;
|
|
|
|
}
|
2001-08-11 00:53:45 +00:00
|
|
|
d_audio->dpos+=len;
|
2001-08-08 19:37:45 +00:00
|
|
|
}
|
|
|
|
}
|
2001-08-11 00:53:45 +00:00
|
|
|
skip_audio_bytes=curr_audio_pos-d_audio->dpos;
|
2001-08-08 19:37:45 +00:00
|
|
|
|
2001-08-11 00:53:45 +00:00
|
|
|
} else {
|
|
|
|
// VBR audio
|
2001-08-11 20:37:33 +00:00
|
|
|
int chunks=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
|
2001-08-11 00:53:45 +00:00
|
|
|
audio_chunk_pos=0;
|
|
|
|
|
|
|
|
// find audio chunk pos:
|
2001-08-11 20:37:33 +00:00
|
|
|
for(i=0;i<priv->idx_size && chunks>0;i++){
|
|
|
|
int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
|
2001-08-11 00:53:45 +00:00
|
|
|
if(avi_stream_id(id)==d_audio->id){
|
2001-08-11 20:37:33 +00:00
|
|
|
len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
|
2001-08-11 00:53:45 +00:00
|
|
|
if(i>chunk_max){
|
|
|
|
skip_audio_bytes+=len;
|
|
|
|
} else {
|
|
|
|
++d_audio->pack_no;
|
|
|
|
d_audio->dpos+=len;
|
|
|
|
audio_chunk_pos=i;
|
|
|
|
}
|
|
|
|
--chunks;
|
|
|
|
}
|
2001-08-08 19:37:45 +00:00
|
|
|
}
|
2001-08-11 00:53:45 +00:00
|
|
|
//if(audio_chunk_pos>chunk_max) audio_chunk_pos=chunk_max;
|
|
|
|
|
|
|
|
// printf("VBR seek: %5.3f -> chunk_no %d -> chunk_idx %d + skip %d \n",
|
2001-08-11 20:37:33 +00:00
|
|
|
// priv->avi_video_pts, audio_chunk_pos, );
|
2001-08-11 00:53:45 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now we have:
|
|
|
|
// audio_chunk_pos = chunk no in index table (it's <=chunk_max)
|
|
|
|
// skip_audio_bytes = bytes to be skipped after chunk seek
|
|
|
|
// d-audio->pack_no = chunk_no in stream at audio_chunk_pos
|
|
|
|
// d_audio->dpos = bytepos in stream at audio_chunk_pos
|
|
|
|
// let's seek!
|
|
|
|
|
|
|
|
// update stream position:
|
|
|
|
d_audio->pos=audio_chunk_pos;
|
|
|
|
// d_audio->dpos=apos;
|
|
|
|
// d_audio->pts=initial_pts_delay+(float)apos/(float)sh_audio->wf->nAvgBytesPerSec;
|
|
|
|
|
|
|
|
if(demuxer->type==DEMUXER_TYPE_AVI){
|
|
|
|
// interleaved stream:
|
|
|
|
if(audio_chunk_pos<video_chunk_pos){
|
2001-08-11 20:37:33 +00:00
|
|
|
// calc priv->skip_video_frames & adjust video pts counter:
|
2001-08-11 00:53:45 +00:00
|
|
|
for(i=audio_chunk_pos;i<video_chunk_pos;i++){
|
2001-08-11 20:37:33 +00:00
|
|
|
int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
|
|
|
|
if(avi_stream_id(id)==d_video->id) ++priv->skip_video_frames;
|
2001-08-11 00:53:45 +00:00
|
|
|
}
|
|
|
|
// requires for correct audio pts calculation (demuxer):
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->avi_video_pts-=priv->skip_video_frames*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
|
|
|
|
priv->idx_pos_a=priv->idx_pos_v=priv->idx_pos=audio_chunk_pos;
|
2001-08-11 00:53:45 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// non-interleaved stream:
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->idx_pos_a=audio_chunk_pos;
|
|
|
|
priv->idx_pos_v=video_chunk_pos;
|
|
|
|
priv->idx_pos=(audio_chunk_pos<video_chunk_pos)?audio_chunk_pos:video_chunk_pos;
|
2001-08-11 00:53:45 +00:00
|
|
|
}
|
2001-08-12 20:52:35 +00:00
|
|
|
|
2001-08-14 07:16:12 +00:00
|
|
|
|
2001-08-08 19:37:45 +00:00
|
|
|
|
2001-08-17 00:40:25 +00:00
|
|
|
mp_msg(MSGT_SEEK,MSGL_V,"SEEK: idx=%d (a:%d v:%d) v.skip=%d a.skip=%d/%4.3f \n",
|
2001-08-11 20:37:33 +00:00
|
|
|
priv->idx_pos,audio_chunk_pos,video_chunk_pos,
|
|
|
|
priv->skip_video_frames,skip_audio_bytes,skip_audio_secs);
|
2001-08-08 19:37:45 +00:00
|
|
|
|
|
|
|
if(skip_audio_bytes){
|
|
|
|
demux_read_data(d_audio,NULL,skip_audio_bytes);
|
|
|
|
//d_audio->pts=0; // PTS is outdated because of the raw data skipping
|
|
|
|
}
|
|
|
|
resync_audio_stream(sh_audio);
|
|
|
|
|
2001-08-11 00:53:45 +00:00
|
|
|
// sh_audio->timer=-skip_audio_secs;
|
2001-08-08 19:37:45 +00:00
|
|
|
|
|
|
|
}
|
2001-08-14 07:16:12 +00:00
|
|
|
d_video->pts=priv->avi_video_pts; // OSD
|
2001-08-08 19:37:45 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-02-24 20:28:24 +00:00
|
|
|
|