annotate demux_avi.c @ 1597:37b81a811cb2

fixed seeking (now allows seeking before start position)
author arpi
date Mon, 20 Aug 2001 21:20:39 +0000
parents 5c7760aa4f94
children 5908dd344067
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
1 // AVI file parser for DEMUXER v2.9 by A'rpi/ESP-team
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
3 #include <stdio.h>
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
4 #include <stdlib.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1421
diff changeset
5 #include <unistd.h>
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
6
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
7 #include "config.h"
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
8 #include "mp_msg.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
9
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
10 #include "stream.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
11 #include "demuxer.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
12
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
13 #include "wine/mmreg.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
14 #include "wine/avifmt.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
15 #include "wine/vfw.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
16
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
17 #include "codec-cfg.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
18 #include "stheader.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
19
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
20 #include "aviheader.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 // Select ds from ID
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
23 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 int stream_id=avi_stream_id(id);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
25
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
26 // printf("demux_avi_select_stream(%d) {a:%d/v:%d}\n",stream_id,
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
27 // demux->audio->id,demux->video->id);
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
28
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
29 if(demux->video->id==-1)
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
30 if(demux->v_streams[stream_id])
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
31 demux->video->id=stream_id;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
32
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
33 if(demux->audio->id==-1)
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
34 if(demux->a_streams[stream_id])
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
35 demux->audio->id=stream_id;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
36
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
37 if(stream_id==demux->audio->id){
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
38 if(!demux->audio->sh){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
39 demux->audio->sh=demux->a_streams[stream_id];
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
40 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected AVI audio ID = %d\n",demux->audio->id);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
41 }
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
42 return demux->audio;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
43 }
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
44 if(stream_id==demux->video->id){
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
45 if(!demux->video->sh){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
46 demux->video->sh=demux->v_streams[stream_id];
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
47 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected AVI video ID = %d\n",demux->video->id);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
48 }
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
49 return demux->video;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
50 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51 if(id!=mmioFOURCC('J','U','N','K')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 // unknown
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
53 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"Unknown chunk: %.4s (%X)\n",(char *) &id,id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 return NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
58 static int demux_avi_read_packet(demuxer_t *demux,unsigned int id,unsigned int len,int idxpos,int flags){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
59 avi_priv_t *priv=demux->priv;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 int skip;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 float pts=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 demux_stream_t *ds=demux_avi_select_stream(demux,id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
64 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"demux_avi.read_packet: %X\n",id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 if(ds==demux->audio){
1455
b2f3962d0e0e interleaved AVI: audio preload PTS compensation
arpi
parents: 1430
diff changeset
67
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
68 if(priv->pts_corrected==0){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
69 // printf("\rYYY-A A: %5.3f V: %5.3f \n",priv->avi_audio_pts,priv->avi_video_pts);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
70 if(priv->pts_has_video){
1455
b2f3962d0e0e interleaved AVI: audio preload PTS compensation
arpi
parents: 1430
diff changeset
71 // we have video pts now
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
72 float delay=(float)priv->pts_corr_bytes/((sh_audio_t*)(ds->sh))->wf->nAvgBytesPerSec;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
73 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);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
74 //priv->pts_correction=-priv->avi_audio_pts+delay;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
75 priv->pts_correction=delay-priv->avi_audio_pts;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
76 priv->avi_audio_pts+=priv->pts_correction;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
77 priv->pts_corrected=1;
1455
b2f3962d0e0e interleaved AVI: audio preload PTS compensation
arpi
parents: 1430
diff changeset
78 } else
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
79 priv->pts_corr_bytes+=len;
1455
b2f3962d0e0e interleaved AVI: audio preload PTS compensation
arpi
parents: 1430
diff changeset
80 }
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
81 pts=priv->avi_audio_pts; //+priv->pts_correction;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
82 priv->avi_audio_pts=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 } else
1409
65058a94df3b video pts calculation fixed (Desperado-trailer.avi)
arpi
parents: 1368
diff changeset
84 if(ds==demux->video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 // video
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
86 if(priv->skip_video_frames>0){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87 // drop frame (seeking)
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
88 --priv->skip_video_frames;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 ds=NULL;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
90 // } else {
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
91 // pts=priv->avi_video_pts;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 // ezt a 2 sort lehet hogy fell kell majd cserelni:
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
94 //priv->avi_video_pts+=avi_pts_frametime;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
95 //priv->avi_video_pts+=(float)avi_header.video.dwScale/(float)avi_header.video.dwRate;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
96 //priv->avi_video_pts+=((sh_video_t*)ds->sh)->frametime;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
97 // FIXME!!!
1368
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
98 #if 1
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
99 // printf("ds=0x%X\n",ds);
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
100 // printf("packno=%d\n",ds->pack_no);
1409
65058a94df3b video pts calculation fixed (Desperado-trailer.avi)
arpi
parents: 1368
diff changeset
101 // printf("### pack_no=%d\n",demux->video->pack_no+demux->video->packs);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
102 priv->avi_video_pts = (demux->video->pack_no+demux->video->packs) *
1368
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
103 (float)((sh_video_t*)demux->video->sh)->video.dwScale /
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
104 (float)((sh_video_t*)demux->video->sh)->video.dwRate;
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
105 #else
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
106 priv->avi_video_pts+=(float)((sh_video_t*)(demux->video->sh))->video.dwScale/(float)((sh_video_t*)(demux->video->sh))->video.dwRate;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
107 // priv->avi_video_pts+=avi_video_ftime;
1368
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
108 #endif
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
109 // printf("\rYYY-V A: %5.3f V: %5.3f \n",priv->avi_audio_pts,priv->avi_video_pts);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
110 priv->avi_audio_pts=priv->avi_video_pts+priv->pts_correction;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
111 priv->pts_has_video=1;
1455
b2f3962d0e0e interleaved AVI: audio preload PTS compensation
arpi
parents: 1430
diff changeset
112
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
113 pts=priv->avi_video_pts;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
114
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
115 //printf("read pack_no: %d pts %5.3f \n",demux->video->pack_no+demux->video->packs,pts);
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
116
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 // len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120 skip=(len+1)&(~1); // total bytes in this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
121
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
122 if(ds){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
123 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Read %d data bytes from packet %04X\n",len,id);
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
124 ds_read_packet(ds,demux->stream,len,pts,idxpos,flags);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125 skip-=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
126 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
127 if(skip){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
128 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Skipping %d bytes from packet %04X\n",skip,id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
129 stream_skip(demux->stream,skip);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131 return ds?1:0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 // 0 = EOF or no stream found
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137 int demux_avi_fill_buffer(demuxer_t *demux){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
138 avi_priv_t *priv=demux->priv;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
139 unsigned int id=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
140 unsigned int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141 int max_packs=128;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142 int ret=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
143
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144 do{
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
145 int flags=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 AVIINDEXENTRY *idx=NULL;
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
147 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
148 demux->filepos=stream_tell(demux->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
149 if(demux->filepos>=demux->movi_end){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 demux->stream->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 if(stream_eof(demux->stream)) return 0;
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
154 #endif
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
155 if(priv->idx_size>0 && priv->idx_pos<priv->idx_size){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 unsigned int pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
158 //if(priv->idx_pos<0) printf("Fatal! idx_pos=%d\n",priv->idx_pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
160 idx=&((AVIINDEXENTRY *)priv->idx)[priv->idx_pos++];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
162 //printf("[%d]",priv->idx_pos);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 //stream_seek(demux->stream,idx.dwChunkOffset);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165 //printf("IDX pos=%X idx.pos=%X idx.size=%X idx.flags=%X\n",demux->filepos,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
166 // pos-4,idx->dwChunkLength,idx->dwFlags);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
167 if(idx->dwFlags&AVIIF_LIST){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
168 // LIST
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
171 if(!demux_avi_select_stream(demux,idx->ckid)){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
172 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173 continue; // skip this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
174 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
175
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
176 pos=idx->dwChunkOffset+priv->idx_offset;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
177 if(pos<demux->movi_start || pos>=demux->movi_end){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
178 mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
179 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
180 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
181 #if 0
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
182 if(pos!=demux->filepos){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
183 mp_msg(MSGT_DEMUX,MSGL_V,"Warning! pos=0x%X idx.pos=0x%X diff=%d \n",demux->filepos,pos,pos-demux->filepos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
184 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
185 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
186 stream_seek(demux->stream,pos);
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
187 demux->filepos=stream_tell(demux->stream);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
188 id=stream_read_dword_le(demux->stream);
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
189 if(stream_eof(demux->stream)) return 0; // EOF!
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
190
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
191 if(id!=idx->ckid){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
192 mp_msg(MSGT_DEMUX,MSGL_V,"ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
1464
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
193 id=idx->ckid;
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
194 // continue;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
195 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196 len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 // if((len&(~1))!=(idx->dwChunkLength&(~1))){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 // if((len)!=(idx->dwChunkLength)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199 if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
200 mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
1464
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
201 len=idx->dwChunkLength;
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
202 // continue;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 }
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
204 if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
205 } else {
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
206 demux->filepos=stream_tell(demux->stream);
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
207 if(demux->filepos>=demux->movi_end){
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
208 demux->stream->eof=1;
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
209 return 0;
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
210 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
211 id=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
212 len=stream_read_dword_le(demux->stream);
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
213 if(stream_eof(demux->stream)) return 0; // EOF!
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
214
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
215 if(id==mmioFOURCC('L','I','S','T')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
216 id=stream_read_dword_le(demux->stream); // list type
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
217 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
218 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
219 }
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
220 ret=demux_avi_read_packet(demux,id,len,priv->idx_pos-1,flags);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
221 if(!ret && priv->skip_video_frames<=0)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 if(--max_packs==0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223 demux->stream->eof=1;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
224 mp_msg(MSGT_DEMUX,MSGL_ERR,"demux: file doesn't contain the selected audio or video stream\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
225 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
226 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227 } while(ret!=1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
229 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
230
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
231
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
233 // 0 = EOF or no stream found
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
234 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
235 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t* ds){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
236 avi_priv_t *priv=demux->priv;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
237 unsigned int id=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
238 unsigned int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 int max_packs=128;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
240 int ret=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
241
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242 do{
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
243 int flags=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 AVIINDEXENTRY *idx=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 int idx_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
246 demux->filepos=stream_tell(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
248 if(ds==demux->video) idx_pos=priv->idx_pos_v++; else
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
249 if(ds==demux->audio) idx_pos=priv->idx_pos_a++; else
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
250 idx_pos=priv->idx_pos++;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
252 if(priv->idx_size>0 && idx_pos<priv->idx_size){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 unsigned int pos;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
254 idx=&((AVIINDEXENTRY *)priv->idx)[idx_pos];
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
255 // idx=&priv->idx[idx_pos];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
257 if(idx->dwFlags&AVIIF_LIST){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258 // LIST
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
262 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263 continue; // skip this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
264 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
266 pos=idx->dwChunkOffset+priv->idx_offset;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
267 if(pos<demux->movi_start || pos>=demux->movi_end){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
268 mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%X idx=0x%X \n",demux->filepos,pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
269 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271 #if 0
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
272 if(pos!=demux->filepos){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
273 mp_msg(MSGT_DEMUX,MSGL_V,"Warning! pos=0x%X idx.pos=0x%X diff=%d \n",demux->filepos,pos,pos-demux->filepos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
274 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
275 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
276 stream_seek(demux->stream,pos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
277
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
278 id=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
279
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
280 if(stream_eof(demux->stream)) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
281
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
282 if(id!=idx->ckid){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
283 mp_msg(MSGT_DEMUX,MSGL_V,"ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
1464
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
284 id=idx->ckid;
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
285 // continue;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
286 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
287 len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
288 // if((len&(~1))!=(idx->dwChunkLength&(~1))){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
289 // if((len)!=(idx->dwChunkLength)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
290 if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
291 mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
1464
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
292 len=idx->dwChunkLength;
891d8b59f2f1 changed chunkid/size check
arpi
parents: 1455
diff changeset
293 // continue;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
294 }
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
295 if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
296 } else return 0;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
297 ret=demux_avi_read_packet(demux,id,len,idx_pos,flags);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
298 if(!ret && priv->skip_video_frames<=0)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
299 if(--max_packs==0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
300 demux->stream->eof=1;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
301 mp_msg(MSGT_DEMUX,MSGL_ERR,"demux: file doesn't contain the selected audio or video stream\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
302 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
303 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
304 } while(ret!=1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
305 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
307
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
308
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310 // 0 = EOF or no stream found
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
311 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
312 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t* ds){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
313 avi_priv_t *priv=demux->priv;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
314 unsigned int id=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
315 unsigned int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
316 int ret=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
317 int *fpos=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
318
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
319 if(ds==demux->video) fpos=&priv->idx_pos_v; else
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
320 if(ds==demux->audio) fpos=&priv->idx_pos_a; else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
321 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
323 stream_seek(demux->stream,fpos[0]);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
324
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
325 do{
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
327 demux->filepos=stream_tell(demux->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
328 if(demux->filepos>=demux->movi_end){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329 demux->stream->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
330 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
331 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
332 if(stream_eof(demux->stream)) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
334 id=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
335 len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
336 if(id==mmioFOURCC('L','I','S','T')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
337 id=stream_read_dword_le(demux->stream); // list type
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
338 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
339 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
340
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
341 if(ds==demux_avi_select_stream(demux,id)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
342 // read it!
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
343 ret=demux_avi_read_packet(demux,id,len,priv->idx_pos-1,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
344 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
345 // skip it!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
346 int skip=(len+1)&(~1); // total bytes in this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
347 stream_skip(demux->stream,skip);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
348 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
349
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
350 } while(ret!=1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
351 fpos[0]=stream_tell(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
352 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
353 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
354
1496
8c3e93ef116d cleanup...
arpi
parents: 1485
diff changeset
355 //extern int audio_id;
8c3e93ef116d cleanup...
arpi
parents: 1485
diff changeset
356 //extern int video_id;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
357 extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
358 extern int force_ni;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
359 extern int pts_from_bps;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
360
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
361 demuxer_t* demux_open_avi(demuxer_t* demuxer){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
362 demux_stream_t *d_audio=demuxer->audio;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
363 demux_stream_t *d_video=demuxer->video;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
364 sh_audio_t *sh_audio=NULL;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
365 sh_video_t *sh_video=NULL;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
366 avi_priv_t* priv=malloc(sizeof(avi_priv_t));
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
367
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
368 // priv struct:
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
369 priv->avi_audio_pts=priv->avi_video_pts=0.0f;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
370 priv->pts_correction=0.0f;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
371 priv->skip_video_frames=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
372 priv->pts_corr_bytes=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
373 priv->pts_has_video=priv->pts_corrected=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
374 demuxer->priv=(void*)priv;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
375
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
376 //---- AVI header:
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
377 read_avi_header(demuxer,(demuxer->stream->type!=STREAMTYPE_STREAM)?index_mode:-2);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
378 stream_reset(demuxer->stream);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
379 stream_seek(demuxer->stream,demuxer->movi_start);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
380 priv->idx_pos=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
381 priv->idx_pos_a=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
382 priv->idx_pos_v=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
383 if(priv->idx_size>0){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
384 // decide index format:
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
385 if(((AVIINDEXENTRY *)priv->idx)[0].dwChunkOffset<demuxer->movi_start)
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
386 priv->idx_offset=demuxer->movi_start-4;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
387 else
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
388 priv->idx_offset=0;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
389 mp_msg(MSGT_DEMUX,MSGL_V,"AVI index offset: %d\n",priv->idx_offset);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
390 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
391 // demuxer->endpos=avi_header.movi_end;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
392
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
393 if(priv->idx_size>0){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
394 // check that file is non-interleaved:
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
395 int i;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
396 int a_pos=-1;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
397 int v_pos=-1;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
398 for(i=0;i<priv->idx_size;i++){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
399 AVIINDEXENTRY* idx=&((AVIINDEXENTRY *)priv->idx)[i];
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
400 demux_stream_t* ds=demux_avi_select_stream(demuxer,idx->ckid);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
401 int pos=idx->dwChunkOffset+priv->idx_offset;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
402 if(a_pos==-1 && ds==demuxer->audio){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
403 a_pos=pos;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
404 if(v_pos!=-1) break;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
405 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
406 if(v_pos==-1 && ds==demuxer->video){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
407 v_pos=pos;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
408 if(a_pos!=-1) break;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
409 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
410 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
411 if(v_pos==-1){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
412 mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI_NI: missing video stream!? contact the author, it may be a bug :(\n");
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
413 return NULL;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
414 // GUI_MSG( mplErrorAVINI )
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
415 // exit(1);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
416 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
417 if(a_pos==-1){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
418 mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI_NI: No audio stream found -> nosound\n");
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
419 sh_audio=NULL;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
420 } else {
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
421 if(force_ni || abs(a_pos-v_pos)>0x100000){ // distance > 1MB
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
422 mp_msg(MSGT_DEMUX,MSGL_INFO,"%s NON-INTERLEAVED AVI file-format!\n",force_ni?"Forced":"Detected");
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
423 demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
424 pts_from_bps=1; // force BPS sync!
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
425 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
426 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
427 } else {
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
428 // no index
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
429 if(force_ni){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
430 mp_msg(MSGT_DEMUX,MSGL_INFO,"Using NON-INTERLEAVED Broken AVI file-format!\n");
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
431 demuxer->type=DEMUXER_TYPE_AVI_NINI; // HACK!!!!
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
432 priv->idx_pos_a=
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
433 priv->idx_pos_v=demuxer->movi_start;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
434 pts_from_bps=1; // force BPS sync!
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
435 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
436 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
437 if(!ds_fill_buffer(d_video)){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
438 mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI: missing video stream!? contact the author, it may be a bug :(\n");
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
439 return NULL;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
440 // GUI_MSG( mplAVIErrorMissingVideoStream )
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
441 // exit(1);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
442 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
443 sh_video=d_video->sh;sh_video->ds=d_video;
1496
8c3e93ef116d cleanup...
arpi
parents: 1485
diff changeset
444 if(d_audio->id!=-2){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
445 mp_msg(MSGT_DEMUX,MSGL_V,"AVI: Searching for audio stream (id:%d)\n",d_audio->id);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
446 if(!ds_fill_buffer(d_audio)){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
447 mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI: No Audio stream found... ->nosound\n");
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
448 sh_audio=NULL;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
449 } else {
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
450 sh_audio=d_audio->sh;sh_audio->ds=d_audio;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
451 sh_audio->format=sh_audio->wf->wFormatTag;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
452 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
453 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
454 // calc. FPS:
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
455 sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
456 sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
457 // calculating video bitrate:
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
458 sh_video->i_bps=demuxer->movi_end-demuxer->movi_start-priv->idx_size*8;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
459 if(sh_audio) sh_video->i_bps-=sh_audio->audio.dwLength;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
460 mp_msg(MSGT_DEMUX,MSGL_V,"AVI video length=%d\n",sh_video->i_bps);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
461 sh_video->i_bps=((float)sh_video->i_bps/(float)sh_video->video.dwLength)*sh_video->fps;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
462 mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n",
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
463 (char *)&sh_video->bih->biCompression,
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
464 sh_video->bih->biWidth,
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
465 sh_video->bih->biHeight,
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
466 sh_video->bih->biBitCount,
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
467 sh_video->fps,
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
468 sh_video->i_bps*0.008f,
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
469 sh_video->i_bps/1024.0f );
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
470
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
471 return demuxer;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
472
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
473 }
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
474
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
475 //extern float initial_pts_delay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
476
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
477 void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
478 avi_priv_t *priv=demuxer->priv;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
479 demux_stream_t *d_audio=demuxer->audio;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
480 demux_stream_t *d_video=demuxer->video;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
481 sh_audio_t *sh_audio=d_audio->sh;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
482 sh_video_t *sh_video=d_video->sh;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
483 float skip_audio_secs=0;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
484
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
485 //FIXME: OFF_T - Didn't check AVI case yet (avi files can't be >2G anyway?)
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
486 //================= seek in AVI ==========================
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
487 int rel_seek_frames=rel_seek_secs*sh_video->fps;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
488 int video_chunk_pos=d_video->pos;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
489 int i;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
490
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
491 priv->skip_video_frames=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
492 priv->avi_audio_pts=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
493
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
494 // ------------ STEP 1: find nearest video keyframe chunk ------------
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
495 // find nearest video keyframe chunk pos:
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
496 if(rel_seek_frames>0){
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
497 // seek forward
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
498 while(video_chunk_pos<priv->idx_size){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
499 int id=((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].ckid;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
500 if(avi_stream_id(id)==d_video->id){ // video frame
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
501 if((--rel_seek_frames)<0 && ((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
502 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
503 ++video_chunk_pos;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
504 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
505 } else {
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
506 // seek backward
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
507 while(video_chunk_pos>0){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
508 int id=((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].ckid;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
509 if(avi_stream_id(id)==d_video->id){ // video frame
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
510 if((++rel_seek_frames)>0 && ((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
511 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
512 --video_chunk_pos;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
513 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
514 }
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
515 priv->idx_pos_a=priv->idx_pos_v=priv->idx_pos=video_chunk_pos;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
516
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
517 // re-calc video pts:
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
518 d_video->pack_no=0;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
519 for(i=0;i<video_chunk_pos;i++){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
520 int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
521 if(avi_stream_id(id)==d_video->id) ++d_video->pack_no;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
522 }
1546
d4cd08b06665 display number of decoded frames (for progr. mpeg2)
arpi
parents: 1508
diff changeset
523 sh_video->num_frames=sh_video->num_frames_decoded=d_video->pack_no;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
524 priv->avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
525 d_video->pos=video_chunk_pos;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
526
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
527 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);
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
528
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
529 // ------------ STEP 2: seek audio, find the right chunk & pos ------------
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
530
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
531 d_audio->pack_no=0;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
532 d_audio->dpos=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
533
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
534 if(sh_audio){
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
535 int i;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
536 // int apos=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
537 int last=0;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
538 int len=0;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
539 int skip_audio_bytes=0;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
540 int curr_audio_pos=-1;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
541 int audio_chunk_pos=-1;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
542 int chunk_max=(demuxer->type==DEMUXER_TYPE_AVI)?video_chunk_pos:priv->idx_size;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
543
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
544 if(sh_audio->audio.dwSampleSize){
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
545 // constant rate audio stream
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
546 #if 0
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
547 int align;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
548 curr_audio_pos=(priv->avi_video_pts) * sh_audio->wf->nAvgBytesPerSec;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
549 if(curr_audio_pos<0)curr_audio_pos=0;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
550 align=sh_audio->audio.dwSampleSize;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
551 if(sh_audio->wf->nBlockAlign>align) align=sh_audio->wf->nBlockAlign;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
552 curr_audio_pos/=align;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
553 curr_audio_pos*=align;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
554 #else
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
555 curr_audio_pos=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
556 curr_audio_pos*=sh_audio->audio.dwSampleSize;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
557 #endif
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
558
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
559 // find audio chunk pos:
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
560 for(i=0;i<chunk_max;i++){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
561 int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
562 if(avi_stream_id(id)==d_audio->id){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
563 len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
564 audio_chunk_pos=i; ++d_audio->pack_no;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
565 if(d_audio->dpos<=curr_audio_pos && curr_audio_pos<(d_audio->dpos+len)){
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
566 //if(verbose)printf("break;\n");
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
567 break;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
568 }
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
569 d_audio->dpos+=len;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
570 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
571 }
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
572 skip_audio_bytes=curr_audio_pos-d_audio->dpos;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
573
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
574 } else {
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
575 // VBR audio
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
576 int chunks=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
577 audio_chunk_pos=0;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
578
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
579 // find audio chunk pos:
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
580 for(i=0;i<priv->idx_size && chunks>0;i++){
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
581 int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
582 if(avi_stream_id(id)==d_audio->id){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
583 len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
584 if(i>chunk_max){
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
585 skip_audio_bytes+=len;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
586 } else {
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
587 ++d_audio->pack_no;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
588 d_audio->dpos+=len;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
589 audio_chunk_pos=i;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
590 }
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
591 --chunks;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
592 }
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
593 }
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
594 //if(audio_chunk_pos>chunk_max) audio_chunk_pos=chunk_max;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
595
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
596 // printf("VBR seek: %5.3f -> chunk_no %d -> chunk_idx %d + skip %d \n",
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
597 // priv->avi_video_pts, audio_chunk_pos, );
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
598
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
599 }
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
600
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
601 // Now we have:
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
602 // audio_chunk_pos = chunk no in index table (it's <=chunk_max)
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
603 // skip_audio_bytes = bytes to be skipped after chunk seek
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
604 // d-audio->pack_no = chunk_no in stream at audio_chunk_pos
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
605 // d_audio->dpos = bytepos in stream at audio_chunk_pos
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
606 // let's seek!
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
607
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
608 // update stream position:
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
609 d_audio->pos=audio_chunk_pos;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
610 // d_audio->dpos=apos;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
611 // d_audio->pts=initial_pts_delay+(float)apos/(float)sh_audio->wf->nAvgBytesPerSec;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
612
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
613 if(demuxer->type==DEMUXER_TYPE_AVI){
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
614 // interleaved stream:
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
615 if(audio_chunk_pos<video_chunk_pos){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
616 // calc priv->skip_video_frames & adjust video pts counter:
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
617 for(i=audio_chunk_pos;i<video_chunk_pos;i++){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
618 int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
619 if(avi_stream_id(id)==d_video->id) ++priv->skip_video_frames;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
620 }
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
621 // requires for correct audio pts calculation (demuxer):
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
622 priv->avi_video_pts-=priv->skip_video_frames*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
623 priv->idx_pos_a=priv->idx_pos_v=priv->idx_pos=audio_chunk_pos;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
624 }
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
625 } else {
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
626 // non-interleaved stream:
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
627 priv->idx_pos_a=audio_chunk_pos;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
628 priv->idx_pos_v=video_chunk_pos;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
629 priv->idx_pos=(audio_chunk_pos<video_chunk_pos)?audio_chunk_pos:video_chunk_pos;
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
630 }
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1496
diff changeset
631
1508
6e752419c7e8 update pts to obtain OSD time display change while rewinding/forwarding
atlka
parents: 1498
diff changeset
632
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
633
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1546
diff changeset
634 mp_msg(MSGT_SEEK,MSGL_V,"SEEK: idx=%d (a:%d v:%d) v.skip=%d a.skip=%d/%4.3f \n",
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
635 priv->idx_pos,audio_chunk_pos,video_chunk_pos,
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1481
diff changeset
636 priv->skip_video_frames,skip_audio_bytes,skip_audio_secs);
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
637
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
638 if(skip_audio_bytes){
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
639 demux_read_data(d_audio,NULL,skip_audio_bytes);
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
640 //d_audio->pts=0; // PTS is outdated because of the raw data skipping
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
641 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
642 resync_audio_stream(sh_audio);
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
643
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1477
diff changeset
644 // sh_audio->timer=-skip_audio_secs;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
645
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
646 }
1508
6e752419c7e8 update pts to obtain OSD time display change while rewinding/forwarding
atlka
parents: 1498
diff changeset
647 d_video->pts=priv->avi_video_pts; // OSD
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
648
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
649 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
650
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
651
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1464
diff changeset
652