]> git.sesse.net Git - vlc/blob - modules/demux/avi/avi.c
* Fix a bug discovered by Chris Rath on seekable files that don't start from point 0.
[vlc] / modules / demux / avi / avi.c
1 /*****************************************************************************
2  * avi.c : AVI file Stream input module for vlc
3  *****************************************************************************
4  * Copyright (C) 2001-2004 the VideoLAN team
5  * $Id$
6  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
7  *
8  * This program is free software; you can redistribute it and/or modify
9  * it under the terms of the GNU General Public License as published by
10  * the Free Software Foundation; either version 2 of the License, or
11  * (at your option) any later version.
12  *
13  * This program is distributed in the hope that it will be useful,
14  * but WITHOUT ANY WARRANTY; without even the implied warranty of
15  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16  * GNU General Public License for more details.
17  *
18  * You should have received a copy of the GNU General Public License
19  * along with this program; if not, write to the Free Software
20  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
21  *****************************************************************************/
22
23 /*****************************************************************************
24  * Preamble
25  *****************************************************************************/
26 #include <stdlib.h>                                      /* malloc(), free() */
27
28 #include <vlc/vlc.h>
29 #include <vlc/input.h>
30
31 #include <vlc_interaction.h>
32
33 #include "vlc_meta.h"
34 #include "codecs.h"
35 #include "charset.h"
36
37 #include "libavi.h"
38
39 /*****************************************************************************
40  * Module descriptor
41  *****************************************************************************/
42
43 #define INTERLEAVE_TEXT N_("Force interleaved method" )
44 #define INTERLEAVE_LONGTEXT N_( "Force interleaved method." )
45
46 #define INDEX_TEXT N_("Force index creation")
47 #define INDEX_LONGTEXT N_( \
48     "Recreate a index for the AVI file. Use this if your AVI file is damaged "\
49     "or incomplete (not seekable)." )
50
51 static int  Open ( vlc_object_t * );
52 static void Close( vlc_object_t * );
53
54 static int pi_index[] = {0,1,2};
55
56 static const char *ppsz_indexes[] = { N_("Ask"), N_("Always fix"),
57                                 N_("Never fix") };
58
59 vlc_module_begin();
60     set_shortname( "AVI" );
61     set_description( _("AVI demuxer") );
62     set_capability( "demux2", 212 );
63     set_category( CAT_INPUT );
64     set_subcategory( SUBCAT_INPUT_DEMUX );
65
66     add_bool( "avi-interleaved", 0, NULL,
67               INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, VLC_TRUE );
68     add_integer( "avi-index", 0, NULL,
69               INDEX_TEXT, INDEX_LONGTEXT, VLC_FALSE );
70         change_integer_list( pi_index, ppsz_indexes, 0 );
71
72     set_callbacks( Open, Close );
73 vlc_module_end();
74
75 /*****************************************************************************
76  * Local prototypes
77  *****************************************************************************/
78 static int Control         ( demux_t *, int, va_list );
79 static int Seek            ( demux_t *, mtime_t, int );
80 static int Demux_Seekable  ( demux_t * );
81 static int Demux_UnSeekable( demux_t * );
82
83 #define __ABS( x ) ( (x) < 0 ? (-(x)) : (x) )
84
85 typedef struct
86 {
87     vlc_fourcc_t i_fourcc;
88     off_t        i_pos;
89     uint32_t     i_size;
90     vlc_fourcc_t i_type;     /* only for AVIFOURCC_LIST */
91
92     uint8_t      i_peek[8];  /* first 8 bytes */
93
94     unsigned int i_stream;
95     unsigned int i_cat;
96 } avi_packet_t;
97
98
99 typedef struct
100 {
101     vlc_fourcc_t i_id;
102     uint32_t     i_flags;
103     off_t        i_pos;
104     uint32_t     i_length;
105     uint32_t     i_lengthtotal;
106
107 } avi_entry_t;
108
109 typedef struct
110 {
111     vlc_bool_t      b_activated;
112
113     unsigned int    i_cat; /* AUDIO_ES, VIDEO_ES */
114     vlc_fourcc_t    i_codec;
115
116     int             i_rate;
117     int             i_scale;
118     int             i_samplesize;
119
120     es_out_id_t     *p_es;
121
122     /* Avi Index */
123     avi_entry_t     *p_index;
124     unsigned int    i_idxnb;
125     unsigned int    i_idxmax;
126
127     unsigned int    i_idxposc;  /* numero of chunk */
128     unsigned int    i_idxposb;  /* byte in the current chunk */
129
130     /* For VBR audio only */
131     unsigned int    i_blockno;
132     unsigned int    i_blocksize;
133
134     /* For muxed streams */
135     stream_t        *p_out_muxed;
136 } avi_track_t;
137
138 struct demux_sys_t
139 {
140     mtime_t i_time;
141     mtime_t i_length;
142
143     vlc_bool_t  b_seekable;
144     vlc_bool_t  b_muxed;
145     avi_chunk_t ck_root;
146
147     vlc_bool_t  b_odml;
148
149     off_t   i_movi_begin;
150     off_t   i_movi_lastchunk_pos;   /* XXX position of last valid chunk */
151
152     /* number of streams and information */
153     unsigned int i_track;
154     avi_track_t  **track;
155
156     /* meta */
157     vlc_meta_t  *meta;
158
159     /* Progress box */
160     mtime_t    last_update;
161     int        i_dialog_id;
162 };
163
164 static inline off_t __EVEN( off_t i )
165 {
166     return (i & 1) ? i + 1 : i;
167 }
168
169 static mtime_t AVI_PTSToChunk( avi_track_t *, mtime_t i_pts );
170 static mtime_t AVI_PTSToByte ( avi_track_t *, mtime_t i_pts );
171 static mtime_t AVI_GetDPTS   ( avi_track_t *, int64_t i_count );
172 static mtime_t AVI_GetPTS    ( avi_track_t * );
173
174
175 static int AVI_StreamChunkFind( demux_t *, unsigned int i_stream );
176 static int AVI_StreamChunkSet ( demux_t *,
177                                 unsigned int i_stream, unsigned int i_ck );
178 static int AVI_StreamBytesSet ( demux_t *,
179                                 unsigned int i_stream, off_t   i_byte );
180
181 vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t );
182 static int   AVI_GetKeyFlag    ( vlc_fourcc_t , uint8_t * );
183
184 static int AVI_PacketGetHeader( demux_t *, avi_packet_t *p_pk );
185 static int AVI_PacketNext     ( demux_t * );
186 static int AVI_PacketRead     ( demux_t *, avi_packet_t *, block_t **);
187 static int AVI_PacketSearch   ( demux_t * );
188
189 static void AVI_IndexLoad    ( demux_t * );
190 static void AVI_IndexCreate  ( demux_t * );
191 static void AVI_IndexAddEntry( demux_sys_t *, int, avi_entry_t * );
192
193 static mtime_t  AVI_MovieGetLength( demux_t * );
194
195 /*****************************************************************************
196  * Stream management
197  *****************************************************************************/
198 static int        AVI_TrackSeek  ( demux_t *, int, mtime_t );
199 static int        AVI_TrackStopFinishedStreams( demux_t *);
200
201 /* Remarks:
202  - For VBR mp3 stream:
203     count blocks by rounded-up chunksizes instead of chunks
204     we need full emulation of dshow avi demuxer bugs :(
205     fixes silly nandub-style a-v delaying in avi with vbr mp3...
206     (from mplayer 2002/08/02)
207  - to complete....
208  */
209
210 /*****************************************************************************
211  * Open: check file and initializes AVI structures
212  *****************************************************************************/
213 static int Open( vlc_object_t * p_this )
214 {
215     demux_t  *p_demux = (demux_t *)p_this;
216     demux_sys_t     *p_sys;
217
218     vlc_bool_t       b_index = VLC_FALSE;
219     int              i_do_index;
220
221     avi_chunk_t         ck_riff;
222     avi_chunk_list_t    *p_riff = (avi_chunk_list_t*)&ck_riff;
223     avi_chunk_list_t    *p_hdrl, *p_movi;
224     avi_chunk_avih_t    *p_avih;
225
226     unsigned int i_track;
227     unsigned int i, i_peeker;
228
229     uint8_t  *p_peek;
230
231     /* Is it an avi file ? */
232     if( stream_Peek( p_demux->s, &p_peek, 200 ) < 200 ) return VLC_EGENERIC;
233
234     for( i_peeker = 0; i_peeker < 188; i_peeker++ )
235     {
236         if( !strncmp( (char *)&p_peek[0], "RIFF", 4 ) &&
237             !strncmp( (char *)&p_peek[8], "AVI ", 4 ) ) break;
238         p_peek++;
239     }
240     if( i_peeker == 188 )
241     {
242         return VLC_EGENERIC;
243     }
244
245     /* Initialize input  structures. */
246     p_sys = p_demux->p_sys = malloc( sizeof(demux_sys_t) );
247     memset( p_sys, 0, sizeof( demux_sys_t ) );
248     p_sys->i_time   = 0;
249     p_sys->i_length = 0;
250     p_sys->i_movi_lastchunk_pos = 0;
251     p_sys->b_odml   = VLC_FALSE;
252     p_sys->b_muxed  = VLC_FALSE;
253     p_sys->i_track  = 0;
254     p_sys->track    = NULL;
255     p_sys->meta     = NULL;
256
257     stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &p_sys->b_seekable );
258
259     p_demux->pf_control = Control;
260     p_demux->pf_demux = Demux_Seekable;
261
262     /* For unseekable stream, automaticaly use Demux_UnSeekable */
263     if( !p_sys->b_seekable || config_GetInt( p_demux, "avi-interleaved" ) )
264     {
265         p_demux->pf_demux = Demux_UnSeekable;
266     }
267
268     if( i_peeker > 0 )
269     {
270         stream_Read( p_demux->s, NULL, i_peeker );
271     }
272
273     if( AVI_ChunkReadRoot( p_demux->s, &p_sys->ck_root ) )
274     {
275         msg_Err( p_demux, "avi module discarded (invalid file)" );
276         return VLC_EGENERIC;
277     }
278
279     if( AVI_ChunkCount( &p_sys->ck_root, AVIFOURCC_RIFF ) > 1 )
280     {
281         unsigned int i_count =
282             AVI_ChunkCount( &p_sys->ck_root, AVIFOURCC_RIFF );
283
284         msg_Warn( p_demux, "multiple riff -> OpenDML ?" );
285         for( i = 1; i < i_count; i++ )
286         {
287             avi_chunk_list_t *p_sysx;
288
289             p_sysx = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, i );
290             if( p_sysx->i_type == AVIFOURCC_AVIX )
291             {
292                 msg_Warn( p_demux, "detected OpenDML file" );
293                 p_sys->b_odml = VLC_TRUE;
294                 break;
295             }
296         }
297     }
298
299     p_riff  = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0 );
300     p_hdrl  = AVI_ChunkFind( p_riff, AVIFOURCC_hdrl, 0 );
301     p_movi  = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0 );
302
303     if( !p_hdrl || !p_movi )
304     {
305         msg_Err( p_demux, "avi module discarded (invalid file)" );
306         goto error;
307     }
308
309     if( !( p_avih = AVI_ChunkFind( p_hdrl, AVIFOURCC_avih, 0 ) ) )
310     {
311         msg_Err( p_demux, "cannot find avih chunk" );
312         goto error;
313     }
314     i_track = AVI_ChunkCount( p_hdrl, AVIFOURCC_strl );
315     if( p_avih->i_streams != i_track )
316     {
317         msg_Warn( p_demux,
318                   "found %d stream but %d are declared",
319                   i_track, p_avih->i_streams );
320     }
321     if( i_track == 0 )
322     {
323         msg_Err( p_demux, "no stream defined!" );
324         goto error;
325     }
326
327     /* print information on streams */
328     msg_Dbg( p_demux, "AVIH: %d stream, flags %s%s%s%s ",
329              i_track,
330              p_avih->i_flags&AVIF_HASINDEX?" HAS_INDEX":"",
331              p_avih->i_flags&AVIF_MUSTUSEINDEX?" MUST_USE_INDEX":"",
332              p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"",
333              p_avih->i_flags&AVIF_TRUSTCKTYPE?" TRUST_CKTYPE":"" );
334     if( ( p_sys->meta = vlc_meta_New() ) )
335     {
336         char buffer[200];
337         sprintf( buffer, "%s%s%s%s",
338                  p_avih->i_flags&AVIF_HASINDEX?" HAS_INDEX":"",
339                  p_avih->i_flags&AVIF_MUSTUSEINDEX?" MUST_USE_INDEX":"",
340                  p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"",
341                  p_avih->i_flags&AVIF_TRUSTCKTYPE?" TRUST_CKTYPE":"" );
342         vlc_meta_SetSetting( p_sys->meta, buffer );
343     }
344
345     /* now read info on each stream and create ES */
346     for( i = 0 ; i < i_track; i++ )
347     {
348         avi_track_t           *tk     = malloc( sizeof( avi_track_t ) );
349         avi_chunk_list_t      *p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i );
350         avi_chunk_strh_t      *p_strh = AVI_ChunkFind( p_strl, AVIFOURCC_strh, 0 );
351         avi_chunk_STRING_t    *p_strn = AVI_ChunkFind( p_strl, AVIFOURCC_strn, 0 );
352         avi_chunk_strf_auds_t *p_auds = NULL;
353         avi_chunk_strf_vids_t *p_vids = NULL;
354         es_format_t fmt;
355
356         tk->b_activated = VLC_FALSE;
357         tk->p_index     = 0;
358         tk->i_idxnb     = 0;
359         tk->i_idxmax    = 0;
360         tk->i_idxposc   = 0;
361         tk->i_idxposb   = 0;
362
363         tk->i_blockno   = 0;
364         tk->i_blocksize = 0;
365
366         tk->p_es        = NULL;
367         tk->p_out_muxed = NULL;
368
369         p_vids = (avi_chunk_strf_vids_t*)AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 );
370         p_auds = (avi_chunk_strf_auds_t*)AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 );
371
372         if( p_strl == NULL || p_strh == NULL || p_auds == NULL || p_vids == NULL )
373         {
374             msg_Warn( p_demux, "stream[%d] incomplete", i );
375             continue;
376         }
377
378         tk->i_rate  = p_strh->i_rate;
379         tk->i_scale = p_strh->i_scale;
380         tk->i_samplesize = p_strh->i_samplesize;
381         msg_Dbg( p_demux, "stream[%d] rate:%d scale:%d samplesize:%d",
382                  i, tk->i_rate, tk->i_scale, tk->i_samplesize );
383
384         switch( p_strh->i_type )
385         {
386             case( AVIFOURCC_auds ):
387                 tk->i_cat   = AUDIO_ES;
388                 tk->i_codec = AVI_FourccGetCodec( AUDIO_ES,
389                                                   p_auds->p_wf->wFormatTag );
390                 if( ( tk->i_blocksize = p_auds->p_wf->nBlockAlign ) == 0 )
391                 {
392                     if( p_auds->p_wf->wFormatTag == 1 )
393                     {
394                         tk->i_blocksize = p_auds->p_wf->nChannels * (p_auds->p_wf->wBitsPerSample/8);
395                     }
396                     else
397                     {
398                         tk->i_blocksize = 1;
399                     }
400                 }
401                 es_format_Init( &fmt, AUDIO_ES, tk->i_codec );
402
403                 fmt.audio.i_channels        = p_auds->p_wf->nChannels;
404                 fmt.audio.i_rate            = p_auds->p_wf->nSamplesPerSec;
405                 fmt.i_bitrate               = p_auds->p_wf->nAvgBytesPerSec*8;
406                 fmt.audio.i_blockalign      = p_auds->p_wf->nBlockAlign;
407                 fmt.audio.i_bitspersample   = p_auds->p_wf->wBitsPerSample;
408                 fmt.i_extra = __MIN( p_auds->p_wf->cbSize,
409                     p_auds->i_chunk_size - sizeof(WAVEFORMATEX) );
410                 fmt.p_extra = &p_auds->p_wf[1];
411                 msg_Dbg( p_demux, "stream[%d] audio(0x%x) %d channels %dHz %dbits",
412                          i, p_auds->p_wf->wFormatTag, p_auds->p_wf->nChannels,
413                          p_auds->p_wf->nSamplesPerSec, p_auds->p_wf->wBitsPerSample);
414                 break;
415
416             case( AVIFOURCC_vids ):
417                 tk->i_cat   = VIDEO_ES;
418                 tk->i_codec = AVI_FourccGetCodec( VIDEO_ES,
419                                                   p_vids->p_bih->biCompression );
420                 if( p_vids->p_bih->biCompression == 0x00 )
421                 {
422                     switch( p_vids->p_bih->biBitCount )
423                     {
424                         case 32:
425                             tk->i_codec = VLC_FOURCC('R','V','3','2');
426                             break;
427                         case 24:
428                             tk->i_codec = VLC_FOURCC('R','V','2','4');
429                             break;
430                         case 16:
431                             /* tk->i_codec = VLC_FOURCC('R','V','1','6');*/
432                             /* break;*/
433                         case 15:
434                             tk->i_codec = VLC_FOURCC('R','V','1','5');
435                             break;
436                         case 9:
437                             tk->i_codec = VLC_FOURCC( 'Y', 'V', 'U', '9' ); /* <- TODO check that */
438                             break;
439                     }
440                     es_format_Init( &fmt, VIDEO_ES, tk->i_codec );
441
442                     if( p_vids->p_bih->biBitCount == 24 )
443                     {
444                         /* This is in BGR format */
445                         fmt.video.i_bmask = 0x00ff0000;
446                         fmt.video.i_gmask = 0x0000ff00;
447                         fmt.video.i_rmask = 0x000000ff;
448                     }
449                 }
450                 else
451                 {
452                     es_format_Init( &fmt, VIDEO_ES, p_vids->p_bih->biCompression );
453                     if( tk->i_codec == FOURCC_mp4v &&
454                         !strncasecmp( (char*)&p_strh->i_handler, "XVID", 4 ) )
455                     {
456                         fmt.i_codec = VLC_FOURCC( 'X', 'V', 'I', 'D' );
457                     }
458                 }
459                 tk->i_samplesize = 0;
460                 fmt.video.i_width  = p_vids->p_bih->biWidth;
461                 fmt.video.i_height = p_vids->p_bih->biHeight;
462                 fmt.video.i_bits_per_pixel = p_vids->p_bih->biBitCount;
463                 fmt.video.i_frame_rate = tk->i_rate;
464                 fmt.video.i_frame_rate_base = tk->i_scale;
465                 fmt.i_extra =
466                     __MIN( p_vids->p_bih->biSize - sizeof( BITMAPINFOHEADER ),
467                            p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER) );
468                 fmt.p_extra = &p_vids->p_bih[1];
469                 msg_Dbg( p_demux, "stream[%d] video(%4.4s) %dx%d %dbpp %ffps",
470                          i, (char*)&p_vids->p_bih->biCompression,
471                          p_vids->p_bih->biWidth,
472                          p_vids->p_bih->biHeight,
473                          p_vids->p_bih->biBitCount,
474                          (float)tk->i_rate/(float)tk->i_scale );
475
476                 if( p_vids->p_bih->biCompression == 0x00 )
477                 {
478                     /* RGB DIB are coded from bottom to top */
479                     fmt.video.i_height =
480                         (unsigned int)(-(int)p_vids->p_bih->biHeight);
481                 }
482
483                 /* Extract palette from extradata if bpp <= 8
484                  * (assumes that extradata contains only palette but appears
485                  *  to be true for all palettized codecs we support) */
486                 if( fmt.i_extra && fmt.video.i_bits_per_pixel <= 8 &&
487                     fmt.video.i_bits_per_pixel > 0 )
488                 {
489                     int i;
490
491                     fmt.video.p_palette = calloc( sizeof(video_palette_t), 1 );
492                     fmt.video.p_palette->i_entries = 1;
493
494                     /* Apparently this is necessary. But why ? */
495                     fmt.i_extra =
496                         p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER);
497                     for( i = 0; i < __MIN(fmt.i_extra/4, 256); i++ )
498                     {
499                         ((uint32_t *)&fmt.video.p_palette->palette[0][0])[i] =
500                             GetDWLE((uint32_t*)fmt.p_extra + i);
501                     }
502                 }
503                 break;
504
505             case( AVIFOURCC_txts):
506                 tk->i_cat   = SPU_ES;
507                 tk->i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
508                 msg_Dbg( p_demux, "stream[%d] subtitles", i );
509                 es_format_Init( &fmt, SPU_ES, tk->i_codec );
510                 break;
511
512             case( AVIFOURCC_iavs):
513             case( AVIFOURCC_ivas):
514                 p_sys->b_muxed = VLC_TRUE;
515                 msg_Dbg( p_demux, "stream[%d] iavs with handler %4.4s", i, (char *)&p_strh->i_handler );
516                 if( p_strh->i_handler == FOURCC_dvsd ||
517                     p_strh->i_handler == FOURCC_dvhd ||
518                     p_strh->i_handler == FOURCC_dvsl )
519                 {
520                     tk->p_out_muxed = stream_DemuxNew( p_demux, (char *)"rawdv", p_demux->out );
521                     if( !tk->p_out_muxed )
522                         msg_Err( p_demux, "could not load the DV parser" );
523                     else break;
524                 }
525                 free( tk );
526                 continue;
527
528             case( AVIFOURCC_mids):
529                 msg_Dbg( p_demux, "stream[%d] midi is UNSUPPORTED", i );
530
531             default:
532                 msg_Warn( p_demux, "stream[%d] unknown type %4.4s", i, (char *)&p_strh->i_type );
533                 free( tk );
534                 continue;
535         }
536         if( p_strn )
537         {
538             /* The charset of p_strn is undefined */
539             EnsureUTF8( p_strn->p_str );
540             fmt.psz_description = strdup( p_strn->p_str );
541         }
542         if( tk->p_out_muxed == NULL )
543             tk->p_es = es_out_Add( p_demux->out, &fmt );
544         TAB_APPEND( p_sys->i_track, p_sys->track, tk );
545     }
546
547     if( p_sys->i_track <= 0 )
548     {
549         msg_Err( p_demux, "no valid track" );
550         goto error;
551     }
552
553     i_do_index =  config_GetInt( p_demux, "avi-index" );
554     if( i_do_index == 1 ) /* Always fix */
555     {
556 aviindex:
557         if( p_sys->b_seekable )
558         {
559             AVI_IndexCreate( p_demux );
560         }
561         else
562         {
563             msg_Warn( p_demux, "cannot create index (unseekable stream)" );
564             AVI_IndexLoad( p_demux );
565         }
566     }
567     else
568     {
569         AVI_IndexLoad( p_demux );
570     }
571
572     /* *** movie length in sec *** */
573     p_sys->i_length = AVI_MovieGetLength( p_demux );
574     if( p_sys->i_length < (mtime_t)p_avih->i_totalframes *
575                           (mtime_t)p_avih->i_microsecperframe /
576                           (mtime_t)1000000 )
577     {
578         msg_Warn( p_demux, "broken or missing index, 'seek' will be "
579                            "axproximative or will have strange behaviour" );
580         if( i_do_index == 0 && !b_index )
581         {
582             int i_create;
583             i_create = intf_UserYesNo( p_demux, _("AVI Index") ,
584                         _( "This AVI file is broken. Seeking will not "
585                         "work correctly.\nDo you want to "
586                         "try to repair it (this might take a long time) ?" ),
587                         _( "Repair" ), _( "Don't repair" ), _( "Cancel") );
588             if( i_create == DIALOG_OK_YES )
589             {
590                 b_index = VLC_TRUE;
591                 msg_Dbg( p_demux, "Fixing AVI index" );
592                 goto aviindex;
593             }
594             else if( i_create == DIALOG_CANCELLED )
595             {
596                 /* Kill input */
597                 p_demux->p_parent->b_die = VLC_TRUE;
598                 goto error;
599             }
600         }
601     }
602
603     /* fix some BeOS MediaKit generated file */
604     for( i = 0 ; i < p_sys->i_track; i++ )
605     {
606         avi_track_t         *tk = p_sys->track[i];
607         avi_chunk_list_t    *p_strl;
608         avi_chunk_strh_t    *p_strh;
609         avi_chunk_strf_auds_t    *p_auds;
610
611         if( tk->i_cat != AUDIO_ES )
612         {
613             continue;
614         }
615         if( tk->i_idxnb < 1 ||
616             tk->i_scale != 1 ||
617             tk->i_samplesize != 0 )
618         {
619             continue;
620         }
621         p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i );
622         p_strh = AVI_ChunkFind( p_strl, AVIFOURCC_strh, 0 );
623         p_auds = AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 );
624
625         if( p_auds->p_wf->wFormatTag != WAVE_FORMAT_PCM &&
626             (unsigned int)tk->i_rate == p_auds->p_wf->nSamplesPerSec )
627         {
628             int64_t i_track_length =
629                 tk->p_index[tk->i_idxnb-1].i_length +
630                 tk->p_index[tk->i_idxnb-1].i_lengthtotal;
631             mtime_t i_length = (mtime_t)p_avih->i_totalframes *
632                                (mtime_t)p_avih->i_microsecperframe;
633
634             if( i_length == 0 )
635             {
636                 msg_Warn( p_demux, "track[%d] cannot be fixed (BeOS MediaKit generated)", i );
637                 continue;
638             }
639             tk->i_samplesize = 1;
640             tk->i_rate       = i_track_length  * (int64_t)1000000/ i_length;
641             msg_Warn( p_demux, "track[%d] fixed with rate=%d scale=%d (BeOS MediaKit generated)", i, tk->i_rate, tk->i_scale );
642         }
643     }
644
645     if( p_sys->b_seekable )
646     {
647         /* we have read all chunk so go back to movi */
648         stream_Seek( p_demux->s, p_movi->i_chunk_pos );
649     }
650     /* Skip movi header */
651     stream_Read( p_demux->s, NULL, 12 );
652
653     p_sys->i_movi_begin = p_movi->i_chunk_pos;
654     return VLC_SUCCESS;
655
656 error:
657     if( p_sys->meta )
658     {
659         vlc_meta_Delete( p_sys->meta );
660     }
661     AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root );
662     free( p_sys );
663     return VLC_EGENERIC;
664 }
665
666 /*****************************************************************************
667  * Close: frees unused data
668  *****************************************************************************/
669 static void Close ( vlc_object_t * p_this )
670 {
671     demux_t *    p_demux = (demux_t *)p_this;
672     unsigned int i;
673     demux_sys_t *p_sys = p_demux->p_sys  ;
674
675     for( i = 0; i < p_sys->i_track; i++ )
676     {
677         if( p_sys->track[i] )
678         {
679             if( p_sys->track[i]->p_out_muxed )
680                 stream_DemuxDelete( p_sys->track[i]->p_out_muxed );
681             FREENULL( p_sys->track[i]->p_index );
682             free( p_sys->track[i] );
683         }
684     }
685     FREENULL( p_sys->track );
686     AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root );
687     vlc_meta_Delete( p_sys->meta );
688
689     free( p_sys );
690 }
691
692 /*****************************************************************************
693  * Demux_Seekable: reads and demuxes data packets for stream seekable
694  *****************************************************************************
695  * AVIDemux: reads and demuxes data packets
696  *****************************************************************************
697  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
698  *****************************************************************************/
699 typedef struct
700 {
701     vlc_bool_t b_ok;
702
703     int i_toread;
704
705     off_t i_posf; /* where we will read :
706                    if i_idxposb == 0 : begining of chunk (+8 to acces data)
707                    else : point on data directly */
708 } avi_track_toread_t;
709
710 static int Demux_Seekable( demux_t *p_demux )
711 {
712     demux_sys_t *p_sys = p_demux->p_sys;
713
714     unsigned int i_track_count = 0;
715     unsigned int i_track;
716     vlc_bool_t b_stream;
717     /* cannot be more than 100 stream (dcXX or wbXX) */
718     avi_track_toread_t toread[100];
719
720
721     /* detect new selected/unselected streams */
722     for( i_track = 0; i_track < p_sys->i_track; i_track++ )
723     {
724         avi_track_t *tk = p_sys->track[i_track];
725         vlc_bool_t  b;
726
727         if( p_sys->b_muxed && tk->p_out_muxed )
728         {
729             i_track_count++;
730             tk->b_activated = VLC_TRUE;
731             continue;
732         }
733
734         es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
735         if( b && !tk->b_activated )
736         {
737             if( p_sys->b_seekable)
738             {
739                 AVI_TrackSeek( p_demux, i_track, p_sys->i_time );
740             }
741             tk->b_activated = VLC_TRUE;
742         }
743         else if( !b && tk->b_activated )
744         {
745             tk->b_activated = VLC_FALSE;
746         }
747         if( b )
748         {
749             i_track_count++;
750         }
751     }
752
753     if( i_track_count <= 0 )
754     {
755         int64_t i_length = p_sys->i_length * (mtime_t)1000000;
756
757         p_sys->i_time += 25*1000;  /* read 25ms */
758         if( i_length > 0 )
759         {
760             if( p_sys->i_time >= i_length )
761                 return 0;
762             return 1;
763         }
764         msg_Warn( p_demux, "no track selected, exiting..." );
765         return 0;
766     }
767
768     /* wait for the good time */
769     es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time + 1 );
770     p_sys->i_time += 25*1000;  /* read 25ms */
771
772     /* init toread */
773     for( i_track = 0; i_track < p_sys->i_track; i_track++ )
774     {
775         avi_track_t *tk = p_sys->track[i_track];
776         mtime_t i_dpts;
777
778         toread[i_track].b_ok = tk->b_activated;
779         if( tk->i_idxposc < tk->i_idxnb )
780         {
781             toread[i_track].i_posf = tk->p_index[tk->i_idxposc].i_pos;
782            if( tk->i_idxposb > 0 )
783            {
784                 toread[i_track].i_posf += 8 + tk->i_idxposb;
785            }
786         }
787         else
788         {
789             toread[i_track].i_posf = -1;
790         }
791
792         i_dpts = p_sys->i_time - AVI_GetPTS( tk  );
793
794         if( tk->i_samplesize )
795         {
796             toread[i_track].i_toread = AVI_PTSToByte( tk, __ABS( i_dpts ) );
797         }
798         else
799         {
800             toread[i_track].i_toread = AVI_PTSToChunk( tk, __ABS( i_dpts ) );
801         }
802
803         if( i_dpts < 0 )
804         {
805             toread[i_track].i_toread *= -1;
806         }
807     }
808
809     b_stream = VLC_FALSE;
810
811     for( ;; )
812     {
813         avi_track_t     *tk;
814         vlc_bool_t       b_done;
815         block_t         *p_frame;
816         off_t i_pos;
817         unsigned int i;
818         size_t i_size;
819
820         /* search for first chunk to be read */
821         for( i = 0, b_done = VLC_TRUE, i_pos = -1; i < p_sys->i_track; i++ )
822         {
823             if( !toread[i].b_ok ||
824                 AVI_GetDPTS( p_sys->track[i],
825                              toread[i].i_toread ) <= -25 * 1000 )
826             {
827                 continue;
828             }
829
830             if( toread[i].i_toread > 0 )
831             {
832                 b_done = VLC_FALSE; /* not yet finished */
833             }
834             if( toread[i].i_posf > 0 )
835             {
836                 if( i_pos == -1 || i_pos > toread[i].i_posf )
837                 {
838                     i_track = i;
839                     i_pos = toread[i].i_posf;
840                 }
841             }
842         }
843
844         if( b_done )
845         {
846             return( 1 );
847         }
848
849         if( i_pos == -1 )
850         {
851             int i_loop_count = 0;
852
853             /* no valid index, we will parse directly the stream
854              * in case we fail we will disable all finished stream */
855             if( p_sys->i_movi_lastchunk_pos >= p_sys->i_movi_begin + 12 )
856             {
857                 stream_Seek( p_demux->s, p_sys->i_movi_lastchunk_pos );
858                 if( AVI_PacketNext( p_demux ) )
859                 {
860                     return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 );
861                 }
862             }
863             else
864             {
865                 stream_Seek( p_demux->s, p_sys->i_movi_begin + 12 );
866             }
867
868             for( ;; )
869             {
870                 avi_packet_t avi_pk;
871
872                 if( AVI_PacketGetHeader( p_demux, &avi_pk ) )
873                 {
874                     msg_Warn( p_demux,
875                              "cannot get packet header, track disabled" );
876                     return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 );
877                 }
878                 if( avi_pk.i_stream >= p_sys->i_track ||
879                     ( avi_pk.i_cat != AUDIO_ES && avi_pk.i_cat != VIDEO_ES ) )
880                 {
881                     if( AVI_PacketNext( p_demux ) )
882                     {
883                         msg_Warn( p_demux,
884                                   "cannot skip packet, track disabled" );
885                         return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 );
886                     }
887
888                     /* Prevents from eating all the CPU with broken files.
889                      * This value should be low enough so that it doesn't
890                      * affect the reading speed too much. */
891                     if( !(++i_loop_count % 1024) )
892                     {
893                         if( p_demux->b_die ) return -1;
894                         msleep( 10000 );
895
896                         if( !(i_loop_count % (1024 * 10)) )
897                             msg_Warn( p_demux,
898                                       "don't seem to find any data..." );
899                     }
900                     continue;
901                 }
902                 else
903                 {
904                     /* add this chunk to the index */
905                     avi_entry_t index;
906
907                     index.i_id = avi_pk.i_fourcc;
908                     index.i_flags =
909                        AVI_GetKeyFlag(p_sys->track[avi_pk.i_stream]->i_codec,
910                                       avi_pk.i_peek);
911                     index.i_pos = avi_pk.i_pos;
912                     index.i_length = avi_pk.i_size;
913                     AVI_IndexAddEntry( p_sys, avi_pk.i_stream, &index );
914
915                     i_track = avi_pk.i_stream;
916                     tk = p_sys->track[i_track];
917                     /* do we will read this data ? */
918                     if( AVI_GetDPTS( tk, toread[i_track].i_toread ) > -25*1000 )
919                     {
920                         break;
921                     }
922                     else
923                     {
924                         if( AVI_PacketNext( p_demux ) )
925                         {
926                             msg_Warn( p_demux,
927                                       "cannot skip packet, track disabled" );
928                             return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 );
929                         }
930                     }
931                 }
932             }
933
934         }
935         else
936         {
937             stream_Seek( p_demux->s, i_pos );
938         }
939
940         /* Set the track to use */
941         tk = p_sys->track[i_track];
942
943         /* read thoses data */
944         if( tk->i_samplesize )
945         {
946             unsigned int i_toread;
947
948             if( ( i_toread = toread[i_track].i_toread ) <= 0 )
949             {
950                 if( tk->i_samplesize > 1 )
951                 {
952                     i_toread = tk->i_samplesize;
953                 }
954                 else
955                 {
956                     i_toread = AVI_PTSToByte( tk, 20 * 1000 );
957                     i_toread = __MAX( i_toread, 100 );
958                 }
959             }
960             i_size = __MIN( tk->p_index[tk->i_idxposc].i_length -
961                                 tk->i_idxposb,
962                             i_toread );
963         }
964         else
965         {
966             i_size = tk->p_index[tk->i_idxposc].i_length;
967         }
968
969         if( tk->i_idxposb == 0 )
970         {
971             i_size += 8; /* need to read and skip header */
972         }
973
974         if( ( p_frame = stream_Block( p_demux->s, __EVEN( i_size ) ) )==NULL )
975         {
976             msg_Warn( p_demux, "failed reading data" );
977             tk->b_activated = VLC_FALSE;
978             toread[i_track].b_ok = VLC_FALSE;
979             continue;
980         }
981         if( i_size % 2 )    /* read was padded on word boundary */
982         {
983             p_frame->i_buffer--;
984         }
985         /* skip header */
986         if( tk->i_idxposb == 0 )
987         {
988             p_frame->p_buffer += 8;
989             p_frame->i_buffer -= 8;
990         }
991         p_frame->i_pts = AVI_GetPTS( tk ) + 1;
992         if( tk->p_index[tk->i_idxposc].i_flags&AVIIF_KEYFRAME )
993         {
994             p_frame->i_flags = BLOCK_FLAG_TYPE_I;
995         }
996         else
997         {
998             p_frame->i_flags = BLOCK_FLAG_TYPE_PB;
999         }
1000
1001         /* read data */
1002         if( tk->i_samplesize )
1003         {
1004             if( tk->i_idxposb == 0 )
1005             {
1006                 i_size -= 8;
1007             }
1008             toread[i_track].i_toread -= i_size;
1009             tk->i_idxposb += i_size;
1010             if( tk->i_idxposb >=
1011                     tk->p_index[tk->i_idxposc].i_length )
1012             {
1013                 tk->i_idxposb = 0;
1014                 tk->i_idxposc++;
1015             }
1016         }
1017         else
1018         {
1019             int i_length = tk->p_index[tk->i_idxposc].i_length;
1020
1021             tk->i_idxposc++;
1022             if( tk->i_cat == AUDIO_ES )
1023             {
1024                 tk->i_blockno += tk->i_blocksize > 0 ? ( i_length + tk->i_blocksize - 1 ) / tk->i_blocksize : 1;
1025             }
1026             toread[i_track].i_toread--;
1027         }
1028
1029         if( tk->i_idxposc < tk->i_idxnb)
1030         {
1031             toread[i_track].i_posf =
1032                 tk->p_index[tk->i_idxposc].i_pos;
1033             if( tk->i_idxposb > 0 )
1034             {
1035                 toread[i_track].i_posf += 8 + tk->i_idxposb;
1036             }
1037
1038         }
1039         else
1040         {
1041             toread[i_track].i_posf = -1;
1042         }
1043
1044         b_stream = VLC_TRUE; /* at least one read succeed */
1045
1046         if( tk->i_cat != VIDEO_ES )
1047             p_frame->i_dts = p_frame->i_pts;
1048         else
1049         {
1050             p_frame->i_dts = p_frame->i_pts;
1051             p_frame->i_pts = 0;
1052         }
1053
1054         //p_pes->i_rate = p_demux->stream.control.i_rate;
1055         if( tk->p_out_muxed )
1056             stream_DemuxSend( tk->p_out_muxed, p_frame );
1057         else
1058             es_out_Send( p_demux->out, tk->p_es, p_frame );
1059     }
1060 }
1061
1062
1063 /*****************************************************************************
1064  * Demux_UnSeekable: reads and demuxes data packets for unseekable file
1065  *****************************************************************************
1066  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
1067  *****************************************************************************/
1068 static int Demux_UnSeekable( demux_t *p_demux )
1069 {
1070     demux_sys_t     *p_sys = p_demux->p_sys;
1071     avi_track_t *p_stream_master = NULL;
1072     unsigned int i_stream;
1073     unsigned int i_packet;
1074
1075     if( p_sys->b_muxed )
1076     {
1077         msg_Err( p_demux, "Can not yet process muxed avi substreams without seeking" );
1078         return VLC_EGENERIC;
1079     }
1080    
1081     es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time + 1 );
1082
1083     /* *** find master stream for data packet skipping algo *** */
1084     /* *** -> first video, if any, or first audio ES *** */
1085     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
1086     {
1087         avi_track_t *tk = p_sys->track[i_stream];
1088         vlc_bool_t  b;
1089
1090         es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
1091
1092         if( b && tk->i_cat == VIDEO_ES )
1093         {
1094             p_stream_master = tk;
1095         }
1096         else if( b )
1097         {
1098             p_stream_master = tk;
1099         }
1100     }
1101
1102     if( !p_stream_master )
1103     {
1104         msg_Warn( p_demux, "no more stream selected" );
1105         return( 0 );
1106     }
1107
1108     p_sys->i_time = AVI_GetPTS( p_stream_master );
1109
1110     for( i_packet = 0; i_packet < 10; i_packet++)
1111     {
1112 #define p_stream    p_sys->track[avi_pk.i_stream]
1113
1114         avi_packet_t    avi_pk;
1115
1116         if( AVI_PacketGetHeader( p_demux, &avi_pk ) )
1117         {
1118             return( 0 );
1119         }
1120
1121         if( avi_pk.i_stream >= p_sys->i_track ||
1122             ( avi_pk.i_cat != AUDIO_ES && avi_pk.i_cat != VIDEO_ES ) )
1123         {
1124             /* we haven't found an audio or video packet:
1125              *  - we have seek, found first next packet
1126              *  - others packets could be found, skip them
1127              */
1128             switch( avi_pk.i_fourcc )
1129             {
1130                 case AVIFOURCC_JUNK:
1131                 case AVIFOURCC_LIST:
1132                 case AVIFOURCC_RIFF:
1133                     return( !AVI_PacketNext( p_demux ) ? 1 : 0 );
1134                 case AVIFOURCC_idx1:
1135                     if( p_sys->b_odml )
1136                     {
1137                         return( !AVI_PacketNext( p_demux ) ? 1 : 0 );
1138                     }
1139                     return( 0 );    /* eof */
1140                 default:
1141                     msg_Warn( p_demux,
1142                               "seems to have lost position, resync" );
1143                     if( AVI_PacketSearch( p_demux ) )
1144                     {
1145                         msg_Err( p_demux, "resync failed" );
1146                         return( -1 );
1147                     }
1148             }
1149         }
1150         else
1151         {
1152             /* check for time */
1153             if( __ABS( AVI_GetPTS( p_stream ) -
1154                         AVI_GetPTS( p_stream_master ) )< 600*1000 )
1155             {
1156                 /* load it and send to decoder */
1157                 block_t *p_frame;
1158                 if( AVI_PacketRead( p_demux, &avi_pk, &p_frame ) || p_frame == NULL )
1159                 {
1160                     return( -1 );
1161                 }
1162                 p_frame->i_pts = AVI_GetPTS( p_stream ) + 1;
1163
1164                 if( avi_pk.i_cat != VIDEO_ES )
1165                     p_frame->i_dts = p_frame->i_pts;
1166                 else
1167                 {
1168                     p_frame->i_dts = p_frame->i_pts;
1169                     p_frame->i_pts = 0;
1170                 }
1171
1172                 //p_pes->i_rate = p_demux->stream.control.i_rate;
1173                 es_out_Send( p_demux->out, p_stream->p_es, p_frame );
1174             }
1175             else
1176             {
1177                 if( AVI_PacketNext( p_demux ) )
1178                 {
1179                     return( 0 );
1180                 }
1181             }
1182
1183             /* *** update stream time position *** */
1184             if( p_stream->i_samplesize )
1185             {
1186                 p_stream->i_idxposb += avi_pk.i_size;
1187             }
1188             else
1189             {
1190                 if( p_stream->i_cat == AUDIO_ES )
1191                 {
1192                     p_stream->i_blockno += p_stream->i_blocksize > 0 ? ( avi_pk.i_size + p_stream->i_blocksize - 1 ) / p_stream->i_blocksize : 1;
1193                 }
1194                 p_stream->i_idxposc++;
1195             }
1196
1197         }
1198 #undef p_stream
1199     }
1200
1201     return( 1 );
1202 }
1203
1204 /*****************************************************************************
1205  * Seek: goto to i_date or i_percent
1206  *****************************************************************************/
1207 static int Seek( demux_t *p_demux, mtime_t i_date, int i_percent )
1208 {
1209
1210     demux_sys_t *p_sys = p_demux->p_sys;
1211     unsigned int i_stream;
1212     msg_Dbg( p_demux, "seek requested: "I64Fd" seconds %d%%",
1213              i_date / 1000000, i_percent );
1214
1215     if( p_sys->b_seekable )
1216     {
1217         if( !p_sys->i_length )
1218         {
1219             avi_track_t *p_stream;
1220             int64_t i_pos;
1221
1222             /* use i_percent to create a true i_date */
1223             msg_Warn( p_demux, "seeking without index at %d%%"
1224                       " only works for interleaved files", i_percent );
1225             if( i_percent >= 100 )
1226             {
1227                 msg_Warn( p_demux, "cannot seek so far !" );
1228                 return VLC_EGENERIC;
1229             }
1230             i_percent = __MAX( i_percent, 0 );
1231
1232             /* try to find chunk that is at i_percent or the file */
1233             i_pos = __MAX( i_percent * stream_Size( p_demux->s ) / 100,
1234                            p_sys->i_movi_begin );
1235             /* search first selected stream */
1236             for( i_stream = 0, p_stream = NULL;
1237                         i_stream < p_sys->i_track; i_stream++ )
1238             {
1239                 p_stream = p_sys->track[i_stream];
1240                 if( p_stream->b_activated )
1241                 {
1242                     break;
1243                 }
1244             }
1245             if( !p_stream || !p_stream->b_activated )
1246             {
1247                 msg_Warn( p_demux, "cannot find any selected stream" );
1248                 return VLC_EGENERIC;
1249             }
1250
1251             /* be sure that the index exist */
1252             if( AVI_StreamChunkSet( p_demux, i_stream, 0 ) )
1253             {
1254                 msg_Warn( p_demux, "cannot seek" );
1255                 return VLC_EGENERIC;
1256             }
1257
1258             while( i_pos >= p_stream->p_index[p_stream->i_idxposc].i_pos +
1259                p_stream->p_index[p_stream->i_idxposc].i_length + 8 )
1260             {
1261                 /* search after i_idxposc */
1262                 if( AVI_StreamChunkSet( p_demux,
1263                                         i_stream, p_stream->i_idxposc + 1 ) )
1264                 {
1265                     msg_Warn( p_demux, "cannot seek" );
1266                     return VLC_EGENERIC;
1267                 }
1268             }
1269
1270             i_date = AVI_GetPTS( p_stream );
1271             /* TODO better support for i_samplesize != 0 */
1272             msg_Dbg( p_demux, "estimate date "I64Fd, i_date );
1273         }
1274
1275 #define p_stream    p_sys->track[i_stream]
1276         p_sys->i_time = 0;
1277         /* seek for chunk based streams */
1278         for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
1279         {
1280             if( p_stream->b_activated && !p_stream->i_samplesize )
1281 /*            if( p_stream->b_activated ) */
1282             {
1283                 AVI_TrackSeek( p_demux, i_stream, i_date );
1284                 p_sys->i_time = __MAX( AVI_GetPTS( p_stream ),
1285                                         p_sys->i_time );
1286             }
1287         }
1288 #if 1
1289         if( p_sys->i_time )
1290         {
1291             i_date = p_sys->i_time;
1292         }
1293         /* seek for bytes based streams */
1294         for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
1295         {
1296             if( p_stream->b_activated && p_stream->i_samplesize )
1297             {
1298                 AVI_TrackSeek( p_demux, i_stream, i_date );
1299 /*                p_sys->i_time = __MAX( AVI_GetPTS( p_stream ), p_sys->i_time );*/
1300             }
1301         }
1302         msg_Dbg( p_demux, "seek: "I64Fd" seconds", p_sys->i_time /1000000 );
1303         /* set true movie time */
1304 #endif
1305         if( !p_sys->i_time )
1306         {
1307             p_sys->i_time = i_date;
1308         }
1309 #undef p_stream
1310         return VLC_SUCCESS;
1311     }
1312     else
1313     {
1314         msg_Err( p_demux, "shouldn't yet be executed" );
1315         return VLC_EGENERIC;
1316     }
1317 }
1318
1319 /*****************************************************************************
1320  * Control:
1321  *****************************************************************************
1322  *
1323  *****************************************************************************/
1324 static double ControlGetPosition( demux_t *p_demux )
1325 {
1326     demux_sys_t *p_sys = p_demux->p_sys;
1327
1328     if( p_sys->i_length > 0 )
1329     {
1330         return (double)p_sys->i_time / (double)( p_sys->i_length * (mtime_t)1000000 );
1331     }
1332     else if( stream_Size( p_demux->s ) > 0 )
1333     {
1334         unsigned int i;
1335         int64_t i_tmp;
1336         int64_t i64 = 0;
1337
1338         /* search the more advanced selected es */
1339         for( i = 0; i < p_sys->i_track; i++ )
1340         {
1341             avi_track_t *tk = p_sys->track[i];
1342             if( tk->b_activated && tk->i_idxposc < tk->i_idxnb )
1343             {
1344                 i_tmp = tk->p_index[tk->i_idxposc].i_pos +
1345                         tk->p_index[tk->i_idxposc].i_length + 8;
1346                 if( i_tmp > i64 )
1347                 {
1348                     i64 = i_tmp;
1349                 }
1350             }
1351         }
1352         return (double)i64 / stream_Size( p_demux->s );
1353     }
1354     return 0.0;
1355 }
1356
1357 static int    Control( demux_t *p_demux, int i_query, va_list args )
1358 {
1359     demux_sys_t *p_sys = p_demux->p_sys;
1360     int i;
1361     double   f, *pf;
1362     int64_t i64, *pi64;
1363     vlc_meta_t *p_meta;
1364
1365     switch( i_query )
1366     {
1367         case DEMUX_GET_POSITION:
1368             pf = (double*)va_arg( args, double * );
1369             *pf = ControlGetPosition( p_demux );
1370             return VLC_SUCCESS;
1371         case DEMUX_SET_POSITION:
1372             f = (double)va_arg( args, double );
1373             if( p_sys->b_seekable )
1374             {
1375                 i64 = (mtime_t)(1000000.0 * p_sys->i_length * f );
1376                 return Seek( p_demux, i64, (int)(f * 100) );
1377             }
1378             else
1379             {
1380                 int64_t i_pos = stream_Size( p_demux->s ) * f;
1381                 return stream_Seek( p_demux->s, i_pos );
1382             }
1383
1384         case DEMUX_GET_TIME:
1385             pi64 = (int64_t*)va_arg( args, int64_t * );
1386             *pi64 = p_sys->i_time;
1387             return VLC_SUCCESS;
1388
1389         case DEMUX_SET_TIME:
1390         {
1391             int i_percent = 0;
1392
1393             i64 = (int64_t)va_arg( args, int64_t );
1394             if( p_sys->i_length > 0 )
1395             {
1396                 i_percent = 100 * i64 / (p_sys->i_length*1000000);
1397             }
1398             else if( p_sys->i_time > 0 )
1399             {
1400                 i_percent = (int)( 100.0 * ControlGetPosition( p_demux ) *
1401                                    (double)i64 / (double)p_sys->i_time );
1402             }
1403             return Seek( p_demux, i64, i_percent );
1404         }
1405         case DEMUX_GET_LENGTH:
1406             pi64 = (int64_t*)va_arg( args, int64_t * );
1407             *pi64 = p_sys->i_length * (mtime_t)1000000;
1408             return VLC_SUCCESS;
1409
1410         case DEMUX_GET_FPS:
1411             pf = (double*)va_arg( args, double * );
1412             *pf = 0.0;
1413             for( i = 0; i < (int)p_sys->i_track; i++ )
1414             {
1415                 avi_track_t *tk = p_sys->track[i];
1416                 if( tk->i_cat == VIDEO_ES && tk->i_scale > 0)
1417                 {
1418                     *pf = (float)tk->i_rate / (float)tk->i_scale;
1419                     break;
1420                 }
1421             }
1422             return VLC_SUCCESS;
1423         case DEMUX_GET_META:
1424             p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
1425             vlc_meta_Merge( p_meta,  p_sys->meta );
1426             return VLC_SUCCESS;
1427
1428         default:
1429             return VLC_EGENERIC;
1430     }
1431 }
1432
1433 /*****************************************************************************
1434  * Function to convert pts to chunk or byte
1435  *****************************************************************************/
1436
1437 static mtime_t AVI_PTSToChunk( avi_track_t *tk, mtime_t i_pts )
1438 {
1439     if( !tk->i_scale )
1440         return (mtime_t)0;
1441
1442     return (mtime_t)((int64_t)i_pts *
1443                      (int64_t)tk->i_rate /
1444                      (int64_t)tk->i_scale /
1445                      (int64_t)1000000 );
1446 }
1447 static mtime_t AVI_PTSToByte( avi_track_t *tk, mtime_t i_pts )
1448 {
1449     if( !tk->i_scale || !tk->i_samplesize )
1450         return (mtime_t)0;
1451
1452     return (mtime_t)((int64_t)i_pts *
1453                      (int64_t)tk->i_rate /
1454                      (int64_t)tk->i_scale /
1455                      (int64_t)1000000 *
1456                      (int64_t)tk->i_samplesize );
1457 }
1458
1459 static mtime_t AVI_GetDPTS( avi_track_t *tk, int64_t i_count )
1460 {
1461     mtime_t i_dpts = 0;
1462
1463     if( !tk->i_rate )
1464         return i_dpts;
1465
1466     i_dpts = (mtime_t)( (int64_t)1000000 *
1467                         (int64_t)i_count *
1468                         (int64_t)tk->i_scale /
1469                         (int64_t)tk->i_rate );
1470
1471     if( tk->i_samplesize )
1472     {
1473         return i_dpts / tk->i_samplesize;
1474     }
1475     return i_dpts;
1476 }
1477
1478 static mtime_t AVI_GetPTS( avi_track_t *tk )
1479 {
1480     if( tk->i_samplesize )
1481     {
1482         int64_t i_count = 0;
1483
1484         /* we need a valid entry we will emulate one */
1485         if( tk->i_idxposc == tk->i_idxnb )
1486         {
1487             if( tk->i_idxposc )
1488             {
1489                 /* use the last entry */
1490                 i_count = tk->p_index[tk->i_idxnb - 1].i_lengthtotal
1491                             + tk->p_index[tk->i_idxnb - 1].i_length;
1492             }
1493         }
1494         else
1495         {
1496             i_count = tk->p_index[tk->i_idxposc].i_lengthtotal;
1497         }
1498         return AVI_GetDPTS( tk, i_count + tk->i_idxposb );
1499     }
1500     else
1501     {
1502         if( tk->i_cat == AUDIO_ES )
1503         {
1504             return AVI_GetDPTS( tk, tk->i_blockno );
1505         }
1506         else
1507         {
1508             return AVI_GetDPTS( tk, tk->i_idxposc );
1509         }
1510     }
1511 }
1512
1513 static int AVI_StreamChunkFind( demux_t *p_demux, unsigned int i_stream )
1514 {
1515     demux_sys_t *p_sys = p_demux->p_sys;
1516     avi_packet_t avi_pk;
1517     int i_loop_count = 0;
1518
1519     /* find first chunk of i_stream that isn't in index */
1520
1521     if( p_sys->i_movi_lastchunk_pos >= p_sys->i_movi_begin + 12 )
1522     {
1523         stream_Seek( p_demux->s, p_sys->i_movi_lastchunk_pos );
1524         if( AVI_PacketNext( p_demux ) )
1525         {
1526             return VLC_EGENERIC;
1527         }
1528     }
1529     else
1530     {
1531         stream_Seek( p_demux->s, p_sys->i_movi_begin + 12 );
1532     }
1533
1534     for( ;; )
1535     {
1536         if( p_demux->b_die ) return VLC_EGENERIC;
1537
1538         if( AVI_PacketGetHeader( p_demux, &avi_pk ) )
1539         {
1540             msg_Warn( p_demux, "cannot get packet header" );
1541             return VLC_EGENERIC;
1542         }
1543         if( avi_pk.i_stream >= p_sys->i_track ||
1544             ( avi_pk.i_cat != AUDIO_ES && avi_pk.i_cat != VIDEO_ES ) )
1545         {
1546             if( AVI_PacketNext( p_demux ) )
1547             {
1548                 return VLC_EGENERIC;
1549             }
1550
1551             /* Prevents from eating all the CPU with broken files.
1552              * This value should be low enough so that it doesn't
1553              * affect the reading speed too much. */
1554             if( !(++i_loop_count % 1024) )
1555             {
1556                 if( p_demux->b_die ) return VLC_EGENERIC;
1557                 msleep( 10000 );
1558
1559                 if( !(i_loop_count % (1024 * 10)) )
1560                     msg_Warn( p_demux, "don't seem to find any data..." );
1561             }
1562         }
1563         else
1564         {
1565             /* add this chunk to the index */
1566             avi_entry_t index;
1567
1568             index.i_id = avi_pk.i_fourcc;
1569             index.i_flags =
1570                AVI_GetKeyFlag(p_sys->track[avi_pk.i_stream]->i_codec,
1571                               avi_pk.i_peek);
1572             index.i_pos = avi_pk.i_pos;
1573             index.i_length = avi_pk.i_size;
1574             AVI_IndexAddEntry( p_sys, avi_pk.i_stream, &index );
1575
1576             if( avi_pk.i_stream == i_stream  )
1577             {
1578                 return VLC_SUCCESS;
1579             }
1580
1581             if( AVI_PacketNext( p_demux ) )
1582             {
1583                 return VLC_EGENERIC;
1584             }
1585         }
1586     }
1587 }
1588
1589 /* be sure that i_ck will be a valid index entry */
1590 static int AVI_StreamChunkSet( demux_t *p_demux, unsigned int i_stream,
1591                                unsigned int i_ck )
1592 {
1593     demux_sys_t *p_sys = p_demux->p_sys;
1594     avi_track_t *p_stream = p_sys->track[i_stream];
1595
1596     p_stream->i_idxposc = i_ck;
1597     p_stream->i_idxposb = 0;
1598
1599     if(  i_ck >= p_stream->i_idxnb )
1600     {
1601         p_stream->i_idxposc = p_stream->i_idxnb - 1;
1602         do
1603         {
1604             p_stream->i_idxposc++;
1605             if( AVI_StreamChunkFind( p_demux, i_stream ) )
1606             {
1607                 return VLC_EGENERIC;
1608             }
1609
1610         } while( p_stream->i_idxposc < i_ck );
1611     }
1612
1613     return VLC_SUCCESS;
1614 }
1615
1616 /* XXX FIXME up to now, we assume that all chunk are one after one */
1617 static int AVI_StreamBytesSet( demux_t    *p_demux,
1618                                unsigned int i_stream,
1619                                off_t   i_byte )
1620 {
1621     demux_sys_t *p_sys = p_demux->p_sys;
1622     avi_track_t *p_stream = p_sys->track[i_stream];
1623
1624     if( ( p_stream->i_idxnb > 0 )
1625         &&( i_byte < p_stream->p_index[p_stream->i_idxnb - 1].i_lengthtotal +
1626                 p_stream->p_index[p_stream->i_idxnb - 1].i_length ) )
1627     {
1628         /* index is valid to find the ck */
1629         /* uses dichototmie to be fast enougth */
1630         int i_idxposc = __MIN( p_stream->i_idxposc, p_stream->i_idxnb - 1 );
1631         int i_idxmax  = p_stream->i_idxnb;
1632         int i_idxmin  = 0;
1633         for( ;; )
1634         {
1635             if( p_stream->p_index[i_idxposc].i_lengthtotal > i_byte )
1636             {
1637                 i_idxmax  = i_idxposc ;
1638                 i_idxposc = ( i_idxmin + i_idxposc ) / 2 ;
1639             }
1640             else
1641             {
1642                 if( p_stream->p_index[i_idxposc].i_lengthtotal +
1643                         p_stream->p_index[i_idxposc].i_length <= i_byte)
1644                 {
1645                     i_idxmin  = i_idxposc ;
1646                     i_idxposc = (i_idxmax + i_idxposc ) / 2 ;
1647                 }
1648                 else
1649                 {
1650                     p_stream->i_idxposc = i_idxposc;
1651                     p_stream->i_idxposb = i_byte -
1652                             p_stream->p_index[i_idxposc].i_lengthtotal;
1653                     return VLC_SUCCESS;
1654                 }
1655             }
1656         }
1657
1658     }
1659     else
1660     {
1661         p_stream->i_idxposc = p_stream->i_idxnb - 1;
1662         p_stream->i_idxposb = 0;
1663         do
1664         {
1665             p_stream->i_idxposc++;
1666             if( AVI_StreamChunkFind( p_demux, i_stream ) )
1667             {
1668                 return VLC_EGENERIC;
1669             }
1670
1671         } while( p_stream->p_index[p_stream->i_idxposc].i_lengthtotal +
1672                     p_stream->p_index[p_stream->i_idxposc].i_length <= i_byte );
1673
1674         p_stream->i_idxposb = i_byte -
1675                        p_stream->p_index[p_stream->i_idxposc].i_lengthtotal;
1676         return VLC_SUCCESS;
1677     }
1678 }
1679
1680 static int AVI_TrackSeek( demux_t *p_demux,
1681                            int i_stream,
1682                            mtime_t i_date )
1683 {
1684     demux_sys_t  *p_sys = p_demux->p_sys;
1685     avi_track_t  *tk = p_sys->track[i_stream];
1686
1687 #define p_stream    p_sys->track[i_stream]
1688     mtime_t i_oldpts;
1689
1690     i_oldpts = AVI_GetPTS( p_stream );
1691
1692     if( !p_stream->i_samplesize )
1693     {
1694         if( AVI_StreamChunkSet( p_demux,
1695                                 i_stream,
1696                                 AVI_PTSToChunk( p_stream, i_date ) ) )
1697         {
1698             return VLC_EGENERIC;
1699         }
1700
1701         if( p_stream->i_cat == AUDIO_ES )
1702         {
1703             unsigned int i;
1704             tk->i_blockno = 0;
1705             for( i = 0; i < tk->i_idxposc; i++ )
1706             {
1707                 if( tk->i_blocksize > 0 )
1708                 {
1709                     tk->i_blockno += ( tk->p_index[i].i_length + tk->i_blocksize - 1 ) / tk->i_blocksize;
1710                 }
1711                 else
1712                 {
1713                     tk->i_blockno++;
1714                 }
1715             }
1716         }
1717
1718         msg_Dbg( p_demux,
1719                  "old:"I64Fd" %s new "I64Fd,
1720                  i_oldpts,
1721                  i_oldpts > i_date ? ">" : "<",
1722                  i_date );
1723
1724         if( p_stream->i_cat == VIDEO_ES )
1725         {
1726             /* search key frame */
1727             if( i_date < i_oldpts )
1728             {
1729                 while( p_stream->i_idxposc > 0 &&
1730                    !( p_stream->p_index[p_stream->i_idxposc].i_flags &
1731                                                                 AVIIF_KEYFRAME ) )
1732                 {
1733                     if( AVI_StreamChunkSet( p_demux,
1734                                             i_stream,
1735                                             p_stream->i_idxposc - 1 ) )
1736                     {
1737                         return VLC_EGENERIC;
1738                     }
1739                 }
1740             }
1741             else
1742             {
1743                 while( p_stream->i_idxposc < p_stream->i_idxnb &&
1744                         !( p_stream->p_index[p_stream->i_idxposc].i_flags &
1745                                                                 AVIIF_KEYFRAME ) )
1746                 {
1747                     if( AVI_StreamChunkSet( p_demux,
1748                                             i_stream,
1749                                             p_stream->i_idxposc + 1 ) )
1750                     {
1751                         return VLC_EGENERIC;
1752                     }
1753                 }
1754             }
1755         }
1756     }
1757     else
1758     {
1759         if( AVI_StreamBytesSet( p_demux,
1760                                 i_stream,
1761                                 AVI_PTSToByte( p_stream, i_date ) ) )
1762         {
1763             return VLC_EGENERIC;
1764         }
1765     }
1766     return VLC_SUCCESS;
1767 #undef p_stream
1768 }
1769
1770 /****************************************************************************
1771  * Return VLC_TRUE if it's a key frame
1772  ****************************************************************************/
1773 static int AVI_GetKeyFlag( vlc_fourcc_t i_fourcc, uint8_t *p_byte )
1774 {
1775     switch( i_fourcc )
1776     {
1777         case FOURCC_DIV1:
1778             /* we have:
1779              *  startcode:      0x00000100   32bits
1780              *  framenumber     ?             5bits
1781              *  piture type     0(I),1(P)     2bits
1782              */
1783             if( GetDWBE( p_byte ) != 0x00000100 )
1784             {
1785                 /* it's not an msmpegv1 stream, strange...*/
1786                 return AVIIF_KEYFRAME;
1787             }
1788             return p_byte[4] & 0x06 ? 0 : AVIIF_KEYFRAME;
1789
1790         case FOURCC_DIV2:
1791         case FOURCC_DIV3:   /* wmv1 also */
1792             /* we have
1793              *  picture type    0(I),1(P)     2bits
1794              */
1795             return p_byte[0] & 0xC0 ? 0 : AVIIF_KEYFRAME;
1796         case FOURCC_mp4v:
1797             /* we should find first occurrence of 0x000001b6 (32bits)
1798              *  startcode:      0x000001b6   32bits
1799              *  piture type     0(I),1(P)     2bits
1800              */
1801             if( GetDWBE( p_byte ) != 0x000001b6 )
1802             {
1803                 /* not true , need to find the first VOP header */
1804                 return AVIIF_KEYFRAME;
1805             }
1806             return p_byte[4] & 0xC0 ? 0 : AVIIF_KEYFRAME;
1807
1808         default:
1809             /* I can't do it, so say yes */
1810             return AVIIF_KEYFRAME;
1811     }
1812 }
1813
1814 vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec )
1815 {
1816     switch( i_cat )
1817     {
1818         case AUDIO_ES:
1819             wf_tag_to_fourcc( i_codec, &i_codec, NULL );
1820             return i_codec;
1821
1822         case VIDEO_ES:
1823             /* XXX DIV1 <- msmpeg4v1, DIV2 <- msmpeg4v2, DIV3 <- msmpeg4v3, mp4v for mpeg4 */
1824             switch( i_codec )
1825             {
1826                 case FOURCC_1:
1827                     return VLC_FOURCC('m','r','l','e');
1828                 case FOURCC_DIV1:
1829                 case FOURCC_div1:
1830                 case FOURCC_MPG4:
1831                 case FOURCC_mpg4:
1832                     return FOURCC_DIV1;
1833                 case FOURCC_DIV2:
1834                 case FOURCC_div2:
1835                 case FOURCC_MP42:
1836                 case FOURCC_mp42:
1837                 case FOURCC_MPG3:
1838                 case FOURCC_mpg3:
1839                     return FOURCC_DIV2;
1840                 case FOURCC_div3:
1841                 case FOURCC_MP43:
1842                 case FOURCC_mp43:
1843                 case FOURCC_DIV3:
1844                 case FOURCC_DIV4:
1845                 case FOURCC_div4:
1846                 case FOURCC_DIV5:
1847                 case FOURCC_div5:
1848                 case FOURCC_DIV6:
1849                 case FOURCC_div6:
1850                 case FOURCC_AP41:
1851                 case FOURCC_3IV1:
1852                 case FOURCC_3iv1:
1853                 case FOURCC_3IVD:
1854                 case FOURCC_3ivd:
1855                 case FOURCC_3VID:
1856                 case FOURCC_3vid:
1857                     return FOURCC_DIV3;
1858                 case FOURCC_DIVX:
1859                 case FOURCC_divx:
1860                 case FOURCC_MP4S:
1861                 case FOURCC_mp4s:
1862                 case FOURCC_M4S2:
1863                 case FOURCC_m4s2:
1864                 case FOURCC_xvid:
1865                 case FOURCC_XVID:
1866                 case FOURCC_XviD:
1867                 case FOURCC_DX50:
1868                 case FOURCC_dx50:
1869                 case FOURCC_mp4v:
1870                 case FOURCC_4:
1871                 case FOURCC_3IV2:
1872                 case FOURCC_3iv2:
1873                     return FOURCC_mp4v;
1874             }
1875         default:
1876             return VLC_FOURCC( 'u', 'n', 'd', 'f' );
1877     }
1878 }
1879
1880 /****************************************************************************
1881  *
1882  ****************************************************************************/
1883 static void AVI_ParseStreamHeader( vlc_fourcc_t i_id,
1884                                    unsigned int *pi_number, unsigned int *pi_type )
1885 {
1886 #define SET_PTR( p, v ) if( p ) *(p) = (v);
1887     int c1, c2;
1888
1889     c1 = ((uint8_t *)&i_id)[0];
1890     c2 = ((uint8_t *)&i_id)[1];
1891
1892     if( c1 < '0' || c1 > '9' || c2 < '0' || c2 > '9' )
1893     {
1894         SET_PTR( pi_number, 100 ); /* > max stream number */
1895         SET_PTR( pi_type, UNKNOWN_ES );
1896     }
1897     else
1898     {
1899         SET_PTR( pi_number, (c1 - '0') * 10 + (c2 - '0' ) );
1900         switch( VLC_TWOCC( ((uint8_t *)&i_id)[2], ((uint8_t *)&i_id)[3] ) )
1901         {
1902             case AVITWOCC_wb:
1903                 SET_PTR( pi_type, AUDIO_ES );
1904                 break;
1905             case AVITWOCC_dc:
1906             case AVITWOCC_db:
1907                 SET_PTR( pi_type, VIDEO_ES );
1908                 break;
1909             default:
1910                 SET_PTR( pi_type, UNKNOWN_ES );
1911                 break;
1912         }
1913     }
1914 #undef SET_PTR
1915 }
1916
1917 /****************************************************************************
1918  *
1919  ****************************************************************************/
1920 static int AVI_PacketGetHeader( demux_t *p_demux, avi_packet_t *p_pk )
1921 {
1922     uint8_t  *p_peek;
1923
1924     if( stream_Peek( p_demux->s, &p_peek, 16 ) < 16 )
1925     {
1926         return VLC_EGENERIC;
1927     }
1928     p_pk->i_fourcc  = VLC_FOURCC( p_peek[0], p_peek[1], p_peek[2], p_peek[3] );
1929     p_pk->i_size    = GetDWLE( p_peek + 4 );
1930     p_pk->i_pos     = stream_Tell( p_demux->s );
1931     if( p_pk->i_fourcc == AVIFOURCC_LIST || p_pk->i_fourcc == AVIFOURCC_RIFF )
1932     {
1933         p_pk->i_type = VLC_FOURCC( p_peek[8],  p_peek[9],
1934                                    p_peek[10], p_peek[11] );
1935     }
1936     else
1937     {
1938         p_pk->i_type = 0;
1939     }
1940
1941     memcpy( p_pk->i_peek, p_peek + 8, 8 );
1942
1943     AVI_ParseStreamHeader( p_pk->i_fourcc, &p_pk->i_stream, &p_pk->i_cat );
1944     return VLC_SUCCESS;
1945 }
1946
1947 static int AVI_PacketNext( demux_t *p_demux )
1948 {
1949     avi_packet_t    avi_ck;
1950     int             i_skip = 0;
1951
1952     if( AVI_PacketGetHeader( p_demux, &avi_ck ) )
1953     {
1954         return VLC_EGENERIC;
1955     }
1956
1957     if( avi_ck.i_fourcc == AVIFOURCC_LIST &&
1958         ( avi_ck.i_type == AVIFOURCC_rec || avi_ck.i_type == AVIFOURCC_movi ) )
1959     {
1960         i_skip = 12;
1961     }
1962     else if( avi_ck.i_fourcc == AVIFOURCC_RIFF &&
1963              avi_ck.i_type == AVIFOURCC_AVIX )
1964     {
1965         i_skip = 24;
1966     }
1967     else
1968     {
1969         i_skip = __EVEN( avi_ck.i_size ) + 8;
1970     }
1971
1972     if( stream_Read( p_demux->s, NULL, i_skip ) != i_skip )
1973     {
1974         return VLC_EGENERIC;
1975     }
1976     return VLC_SUCCESS;
1977 }
1978
1979 static int AVI_PacketRead( demux_t   *p_demux,
1980                            avi_packet_t     *p_pk,
1981                            block_t          **pp_frame )
1982 {
1983     size_t i_size;
1984
1985     i_size = __EVEN( p_pk->i_size + 8 );
1986
1987     if( ( *pp_frame = stream_Block( p_demux->s, i_size ) ) == NULL )
1988     {
1989         return VLC_EGENERIC;
1990     }
1991     (*pp_frame)->p_buffer += 8;
1992     (*pp_frame)->i_buffer -= 8;
1993
1994     if( i_size != p_pk->i_size + 8 )
1995     {
1996         (*pp_frame)->i_buffer--;
1997     }
1998
1999     return VLC_SUCCESS;
2000 }
2001
2002 static int AVI_PacketSearch( demux_t *p_demux )
2003 {
2004     demux_sys_t     *p_sys = p_demux->p_sys;
2005     avi_packet_t    avi_pk;
2006     int             i_count = 0;
2007
2008     for( ;; )
2009     {
2010         if( stream_Read( p_demux->s, NULL, 1 ) != 1 )
2011         {
2012             return VLC_EGENERIC;
2013         }
2014         AVI_PacketGetHeader( p_demux, &avi_pk );
2015         if( avi_pk.i_stream < p_sys->i_track &&
2016             ( avi_pk.i_cat == AUDIO_ES || avi_pk.i_cat == VIDEO_ES ) )
2017         {
2018             return VLC_SUCCESS;
2019         }
2020         switch( avi_pk.i_fourcc )
2021         {
2022             case AVIFOURCC_JUNK:
2023             case AVIFOURCC_LIST:
2024             case AVIFOURCC_RIFF:
2025             case AVIFOURCC_idx1:
2026                 return VLC_SUCCESS;
2027         }
2028
2029         /* Prevents from eating all the CPU with broken files.
2030          * This value should be low enough so that it doesn't affect the
2031          * reading speed too much (not that we care much anyway because
2032          * this code is called only on broken files). */
2033         if( !(++i_count % 1024) )
2034         {
2035             if( p_demux->b_die ) return VLC_EGENERIC;
2036
2037             msleep( 10000 );
2038             if( !(i_count % (1024 * 10)) )
2039                 msg_Warn( p_demux, "trying to resync..." );
2040         }
2041     }
2042 }
2043
2044 /****************************************************************************
2045  * Index stuff.
2046  ****************************************************************************/
2047 static void AVI_IndexAddEntry( demux_sys_t *p_sys,
2048                                int i_stream,
2049                                avi_entry_t *p_index)
2050 {
2051     avi_track_t *tk = p_sys->track[i_stream];
2052
2053     /* Update i_movi_lastchunk_pos */
2054     if( p_sys->i_movi_lastchunk_pos < p_index->i_pos )
2055     {
2056         p_sys->i_movi_lastchunk_pos = p_index->i_pos;
2057     }
2058
2059     /* add the entry */
2060     if( tk->i_idxnb >= tk->i_idxmax )
2061     {
2062         tk->i_idxmax += 16384;
2063         tk->p_index = realloc( tk->p_index,
2064                                tk->i_idxmax * sizeof( avi_entry_t ) );
2065         if( tk->p_index == NULL )
2066         {
2067             return;
2068         }
2069     }
2070     /* calculate cumulate length */
2071     if( tk->i_idxnb > 0 )
2072     {
2073         p_index->i_lengthtotal =
2074             tk->p_index[tk->i_idxnb - 1].i_length +
2075                 tk->p_index[tk->i_idxnb - 1].i_lengthtotal;
2076     }
2077     else
2078     {
2079         p_index->i_lengthtotal = 0;
2080     }
2081
2082     tk->p_index[tk->i_idxnb++] = *p_index;
2083 }
2084
2085 static int AVI_IndexLoad_idx1( demux_t *p_demux )
2086 {
2087     demux_sys_t *p_sys = p_demux->p_sys;
2088
2089     avi_chunk_list_t    *p_riff;
2090     avi_chunk_list_t    *p_movi;
2091     avi_chunk_idx1_t    *p_idx1;
2092
2093     unsigned int i_stream;
2094     unsigned int i_index;
2095     off_t        i_offset;
2096     unsigned int i;
2097
2098     vlc_bool_t b_keyset[100];
2099
2100     p_riff = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0);
2101     p_idx1 = AVI_ChunkFind( p_riff, AVIFOURCC_idx1, 0);
2102     p_movi = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0);
2103
2104     if( !p_idx1 )
2105     {
2106         msg_Warn( p_demux, "cannot find idx1 chunk, no index defined" );
2107         return VLC_EGENERIC;
2108     }
2109
2110     /* *** calculate offset *** */
2111     /* Well, avi is __SHIT__ so test more than one entry
2112      * (needed for some avi files) */
2113     i_offset = 0;
2114     for( i = 0; i < __MIN( p_idx1->i_entry_count, 10 ); i++ )
2115     {
2116         if( p_idx1->entry[i].i_pos < p_movi->i_chunk_pos )
2117         {
2118             i_offset = p_movi->i_chunk_pos + 8;
2119             break;
2120         }
2121     }
2122
2123     /* Reset b_keyset */
2124     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
2125         b_keyset[i_stream] = VLC_FALSE;
2126
2127     for( i_index = 0; i_index < p_idx1->i_entry_count; i_index++ )
2128     {
2129         unsigned int i_cat;
2130
2131         AVI_ParseStreamHeader( p_idx1->entry[i_index].i_fourcc,
2132                                &i_stream,
2133                                &i_cat );
2134         if( i_stream < p_sys->i_track &&
2135             i_cat == p_sys->track[i_stream]->i_cat )
2136         {
2137             avi_entry_t index;
2138             index.i_id      = p_idx1->entry[i_index].i_fourcc;
2139             index.i_flags   =
2140                 p_idx1->entry[i_index].i_flags&(~AVIIF_FIXKEYFRAME);
2141             index.i_pos     = p_idx1->entry[i_index].i_pos + i_offset;
2142             index.i_length  = p_idx1->entry[i_index].i_length;
2143             AVI_IndexAddEntry( p_sys, i_stream, &index );
2144
2145             if( index.i_flags&AVIIF_KEYFRAME )
2146                 b_keyset[i_stream] = VLC_TRUE;
2147         }
2148     }
2149
2150     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
2151     {
2152         if( !b_keyset[i_stream] )
2153         {
2154             avi_track_t *tk = p_sys->track[i_stream];
2155
2156             msg_Dbg( p_demux, "no key frame set for track %d", i_stream );
2157             for( i_index = 0; i_index < tk->i_idxnb; i_index++ )
2158                 tk->p_index[i_index].i_flags |= AVIIF_KEYFRAME;
2159         }
2160     }
2161     return VLC_SUCCESS;
2162 }
2163
2164 static void __Parse_indx( demux_t    *p_demux,
2165                           int               i_stream,
2166                           avi_chunk_indx_t  *p_indx )
2167 {
2168     demux_sys_t         *p_sys    = p_demux->p_sys;
2169     avi_entry_t     index;
2170     int32_t             i;
2171
2172     msg_Dbg( p_demux, "loading subindex(0x%x) %d entries", p_indx->i_indextype, p_indx->i_entriesinuse );
2173     if( p_indx->i_indexsubtype == 0 )
2174     {
2175         for( i = 0; i < p_indx->i_entriesinuse; i++ )
2176         {
2177             index.i_id      = p_indx->i_id;
2178             index.i_flags   = p_indx->idx.std[i].i_size & 0x80000000 ? 0 : AVIIF_KEYFRAME;
2179             index.i_pos     = p_indx->i_baseoffset + p_indx->idx.std[i].i_offset - 8;
2180             index.i_length  = p_indx->idx.std[i].i_size&0x7fffffff;
2181
2182             AVI_IndexAddEntry( p_sys, i_stream, &index );
2183         }
2184     }
2185     else if( p_indx->i_indexsubtype == AVI_INDEX_2FIELD )
2186     {
2187         for( i = 0; i < p_indx->i_entriesinuse; i++ )
2188         {
2189             index.i_id      = p_indx->i_id;
2190             index.i_flags   = p_indx->idx.field[i].i_size & 0x80000000 ? 0 : AVIIF_KEYFRAME;
2191             index.i_pos     = p_indx->i_baseoffset + p_indx->idx.field[i].i_offset - 8;
2192             index.i_length  = p_indx->idx.field[i].i_size;
2193
2194             AVI_IndexAddEntry( p_sys, i_stream, &index );
2195         }
2196     }
2197     else
2198     {
2199         msg_Warn( p_demux, "unknown subtype index(0x%x)", p_indx->i_indexsubtype );
2200     }
2201 }
2202
2203 static void AVI_IndexLoad_indx( demux_t *p_demux )
2204 {
2205     demux_sys_t         *p_sys = p_demux->p_sys;
2206     unsigned int        i_stream;
2207     int32_t             i;
2208
2209     avi_chunk_list_t    *p_riff;
2210     avi_chunk_list_t    *p_hdrl;
2211
2212     p_riff = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0);
2213     p_hdrl = AVI_ChunkFind( p_riff, AVIFOURCC_hdrl, 0 );
2214
2215     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
2216     {
2217         avi_chunk_list_t    *p_strl;
2218         avi_chunk_indx_t    *p_indx;
2219
2220 #define p_stream  p_sys->track[i_stream]
2221         p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i_stream );
2222         p_indx = AVI_ChunkFind( p_strl, AVIFOURCC_indx, 0 );
2223
2224         if( !p_indx )
2225         {
2226             msg_Warn( p_demux, "cannot find indx (misdetect/broken OpenDML "
2227                                "file?)" );
2228             continue;
2229         }
2230
2231         if( p_indx->i_indextype == AVI_INDEX_OF_CHUNKS )
2232         {
2233             __Parse_indx( p_demux, i_stream, p_indx );
2234         }
2235         else if( p_indx->i_indextype == AVI_INDEX_OF_INDEXES )
2236         {
2237             avi_chunk_t    ck_sub;
2238             for( i = 0; i < p_indx->i_entriesinuse; i++ )
2239             {
2240                 if( stream_Seek( p_demux->s, p_indx->idx.super[i].i_offset )||
2241                     AVI_ChunkRead( p_demux->s, &ck_sub, NULL  ) )
2242                 {
2243                     break;
2244                 }
2245                 __Parse_indx( p_demux, i_stream, &ck_sub.indx );
2246             }
2247         }
2248         else
2249         {
2250             msg_Warn( p_demux, "unknown type index(0x%x)", p_indx->i_indextype );
2251         }
2252 #undef p_stream
2253     }
2254 }
2255
2256 static void AVI_IndexLoad( demux_t *p_demux )
2257 {
2258     demux_sys_t *p_sys = p_demux->p_sys;
2259     unsigned int i_stream;
2260
2261     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
2262     {
2263         p_sys->track[i_stream]->i_idxnb  = 0;
2264         p_sys->track[i_stream]->i_idxmax = 0;
2265         p_sys->track[i_stream]->p_index  = NULL;
2266     }
2267
2268     if( p_sys->b_odml )
2269     {
2270         AVI_IndexLoad_indx( p_demux );
2271     }
2272     else  if( AVI_IndexLoad_idx1( p_demux ) )
2273     {
2274         /* try indx if idx1 failed as some "normal" file have indx too */
2275         AVI_IndexLoad_indx( p_demux );
2276     }
2277
2278     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
2279     {
2280         msg_Dbg( p_demux, "stream[%d] created %d index entries",
2281                 i_stream, p_sys->track[i_stream]->i_idxnb );
2282     }
2283 }
2284
2285 static void AVI_IndexCreate( demux_t *p_demux )
2286 {
2287     demux_sys_t *p_sys = p_demux->p_sys;
2288
2289     avi_chunk_list_t    *p_riff;
2290     avi_chunk_list_t    *p_movi;
2291
2292     unsigned int i_stream;
2293     off_t i_movi_end;
2294
2295     p_riff = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0);
2296     p_movi = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0);
2297
2298     if( !p_movi )
2299     {
2300         msg_Err( p_demux, "cannot find p_movi" );
2301         return;
2302     }
2303
2304     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
2305     {
2306         p_sys->track[i_stream]->i_idxnb  = 0;
2307         p_sys->track[i_stream]->i_idxmax = 0;
2308         p_sys->track[i_stream]->p_index  = NULL;
2309     }
2310     i_movi_end = __MIN( (off_t)(p_movi->i_chunk_pos + p_movi->i_chunk_size),
2311                         stream_Size( p_demux->s ) );
2312
2313     stream_Seek( p_demux->s, p_movi->i_chunk_pos + 12 );
2314     msg_Warn( p_demux, "creating index from LIST-movi, will take time !" );
2315
2316
2317     /* Only show dialog if AVI is > 10MB */
2318     p_demux->p_sys->i_dialog_id = -1;
2319     if( stream_Size( p_demux->s ) > 10000000 )
2320     {
2321         p_demux->p_sys->i_dialog_id = intf_IntfProgress( p_demux,
2322                                         _( "Fixing AVI Index..." ),
2323                                         0.0 );
2324         p_demux->p_sys->last_update = mdate();
2325     }
2326
2327     for( ;; )
2328     {
2329         avi_packet_t pk;
2330
2331         if( p_demux->b_die )
2332         {
2333             return;
2334         }
2335
2336         /* Don't update dialog too often */
2337         if( p_demux->p_sys->i_dialog_id > 0 &&
2338             mdate() - p_demux->p_sys->last_update > 100000 )
2339         {
2340             int64_t i_pos = stream_Tell( p_demux->s )* 100 /
2341                             stream_Size( p_demux->s );
2342             float f_pos = (float)i_pos;
2343             p_demux->p_sys->last_update = mdate();
2344             intf_ProgressUpdate( p_demux, p_demux->p_sys->i_dialog_id,
2345                                  _( "Fixing AVI Index..." ), f_pos, -1 );
2346         }
2347
2348         if( AVI_PacketGetHeader( p_demux, &pk ) )
2349         {
2350             break;
2351         }
2352         if( pk.i_stream < p_sys->i_track &&
2353             pk.i_cat == p_sys->track[pk.i_stream]->i_cat )
2354         {
2355             avi_entry_t index;
2356             index.i_id      = pk.i_fourcc;
2357             index.i_flags   =
2358                AVI_GetKeyFlag(p_sys->track[pk.i_stream]->i_codec, pk.i_peek);
2359             index.i_pos     = pk.i_pos;
2360             index.i_length  = pk.i_size;
2361             AVI_IndexAddEntry( p_sys, pk.i_stream, &index );
2362         }
2363         else
2364         {
2365             switch( pk.i_fourcc )
2366             {
2367                 case AVIFOURCC_idx1:
2368                     if( p_sys->b_odml )
2369                     {
2370                         avi_chunk_list_t *p_sysx;
2371                         p_sysx = AVI_ChunkFind( &p_sys->ck_root,
2372                                                 AVIFOURCC_RIFF, 1 );
2373
2374                         msg_Dbg( p_demux, "looking for new RIFF chunk" );
2375                         if( stream_Seek( p_demux->s, p_sysx->i_chunk_pos + 24))
2376                         {
2377                             goto print_stat;
2378                         }
2379                         break;
2380                     }
2381                     goto print_stat;
2382                 case AVIFOURCC_RIFF:
2383                         msg_Dbg( p_demux, "new RIFF chunk found" );
2384                 case AVIFOURCC_rec:
2385                 case AVIFOURCC_JUNK:
2386                     break;
2387                 default:
2388                     msg_Warn( p_demux, "need resync, probably broken avi" );
2389                     if( AVI_PacketSearch( p_demux ) )
2390                     {
2391                         msg_Warn( p_demux, "lost sync, abord index creation" );
2392                         goto print_stat;
2393                     }
2394             }
2395         }
2396
2397         if( ( !p_sys->b_odml && pk.i_pos + pk.i_size >= i_movi_end ) ||
2398             AVI_PacketNext( p_demux ) )
2399         {
2400             break;
2401         }
2402     }
2403
2404 print_stat:
2405     if( p_demux->p_sys->i_dialog_id > 0 )
2406     {
2407         intf_UserHide( p_demux, p_demux->p_sys->i_dialog_id );
2408     }
2409
2410     for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ )
2411     {
2412         msg_Dbg( p_demux,
2413                 "stream[%d] creating %d index entries",
2414                 i_stream,
2415                 p_sys->track[i_stream]->i_idxnb );
2416     }
2417 }
2418
2419 /*****************************************************************************
2420  * Stream management
2421  *****************************************************************************/
2422 static int AVI_TrackStopFinishedStreams( demux_t *p_demux )
2423 {
2424     demux_sys_t *p_sys = p_demux->p_sys;
2425     unsigned int i;
2426     int b_end = VLC_TRUE;
2427
2428     for( i = 0; i < p_sys->i_track; i++ )
2429     {
2430         avi_track_t *tk = p_sys->track[i];
2431         if( tk->i_idxposc >= tk->i_idxnb )
2432         {
2433             tk->b_activated = VLC_FALSE;
2434             if( tk->p_es ) es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->p_es, VLC_FALSE );
2435         }
2436         else
2437         {
2438             b_end = VLC_FALSE;
2439         }
2440     }
2441     return( b_end );
2442 }
2443
2444 /****************************************************************************
2445  * AVI_MovieGetLength give max streams length in second
2446  ****************************************************************************/
2447 static mtime_t  AVI_MovieGetLength( demux_t *p_demux )
2448 {
2449     demux_sys_t  *p_sys = p_demux->p_sys;
2450     mtime_t      i_maxlength = 0;
2451     unsigned int i;
2452
2453     for( i = 0; i < p_sys->i_track; i++ )
2454     {
2455         avi_track_t *tk = p_sys->track[i];
2456         mtime_t i_length;
2457
2458         /* fix length for each stream */
2459         if( tk->i_idxnb < 1 || !tk->p_index )
2460         {
2461             continue;
2462         }
2463
2464         if( tk->i_samplesize )
2465         {
2466             i_length = AVI_GetDPTS( tk,
2467                                     tk->p_index[tk->i_idxnb-1].i_lengthtotal +
2468                                         tk->p_index[tk->i_idxnb-1].i_length );
2469         }
2470         else
2471         {
2472             i_length = AVI_GetDPTS( tk, tk->i_idxnb );
2473         }
2474         i_length /= (mtime_t)1000000;    /* in seconds */
2475
2476         msg_Dbg( p_demux,
2477                  "stream[%d] length:"I64Fd" (based on index)",
2478                  i,
2479                  i_length );
2480         i_maxlength = __MAX( i_maxlength, i_length );
2481     }
2482
2483     return i_maxlength;
2484 }