annotate demux_avi.c @ 1498:6174b815b5f4

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