]> git.sesse.net Git - vlc/blob - modules/demux/ogg.c
demux/mp4: add parsing of mfra atom
[vlc] / modules / demux / ogg.c
1 /*****************************************************************************
2  * ogg.c : ogg stream demux module for vlc
3  *****************************************************************************
4  * Copyright (C) 2001-2007 the VideoLAN team
5  * $Id$
6  *
7  * Authors: Gildas Bazin <gbazin@netcourrier.com>
8  *          Andre Pang <Andre.Pang@csiro.au> (Annodex support)
9  *
10  * This program is free software; you can redistribute it and/or modify
11  * it under the terms of the GNU General Public License as published by
12  * the Free Software Foundation; either version 2 of the License, or
13  * (at your option) any later version.
14  *
15  * This program is distributed in the hope that it will be useful,
16  * but WITHOUT ANY WARRANTY; without even the implied warranty of
17  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18  * GNU General Public License for more details.
19  *
20  * You should have received a copy of the GNU General Public License
21  * along with this program; if not, write to the Free Software
22  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
23  *****************************************************************************/
24
25 /*****************************************************************************
26  * Preamble
27  *****************************************************************************/
28 #ifdef HAVE_CONFIG_H
29 # include "config.h"
30 #endif
31
32 #include <vlc_common.h>
33 #include <vlc_plugin.h>
34 #include <vlc_demux.h>
35 #include <vlc_meta.h>
36 #include <vlc_input.h>
37
38 #include <ogg/ogg.h>
39
40 #include <vlc_codecs.h>
41 #include <vlc_bits.h>
42 #include "xiph.h"
43 #include "vorbis.h"
44 #include "kate_categories.h"
45 #include "ogg.h"
46 #include "oggseek.h"
47
48 /*****************************************************************************
49  * Module descriptor
50  *****************************************************************************/
51 static int  Open ( vlc_object_t * );
52 static void Close( vlc_object_t * );
53
54 vlc_module_begin ()
55     set_shortname ( "OGG" )
56     set_description( N_("OGG demuxer" ) )
57     set_category( CAT_INPUT )
58     set_subcategory( SUBCAT_INPUT_DEMUX )
59     set_capability( "demux", 50 )
60     set_callbacks( Open, Close )
61     add_shortcut( "ogg" )
62 vlc_module_end ()
63
64
65 /*****************************************************************************
66  * Definitions of structures and functions used by this plugins
67  *****************************************************************************/
68
69 /* OggDS headers for the new header format (used in ogm files) */
70 typedef struct
71 {
72     ogg_int32_t width;
73     ogg_int32_t height;
74 } stream_header_video_t;
75
76 typedef struct
77 {
78     ogg_int16_t channels;
79     ogg_int16_t padding;
80     ogg_int16_t blockalign;
81     ogg_int32_t avgbytespersec;
82 } stream_header_audio_t;
83
84 typedef struct
85 {
86     char        streamtype[8];
87     char        subtype[4];
88
89     ogg_int32_t size;                               /* size of the structure */
90
91     ogg_int64_t time_unit;                              /* in reference time */
92     ogg_int64_t samples_per_unit;
93     ogg_int32_t default_len;                                /* in media time */
94
95     ogg_int32_t buffersize;
96     ogg_int16_t bits_per_sample;
97     ogg_int16_t padding;
98
99     union
100     {
101         /* Video specific */
102         stream_header_video_t video;
103         /* Audio specific */
104         stream_header_audio_t audio;
105     } sh;
106 } stream_header_t;
107
108
109 /* Some defines from OggDS */
110 #define PACKET_TYPE_HEADER   0x01
111 #define PACKET_TYPE_BITS     0x07
112 #define PACKET_LEN_BITS01    0xc0
113 #define PACKET_LEN_BITS2     0x02
114 #define PACKET_IS_SYNCPOINT  0x08
115
116 /*****************************************************************************
117  * Local prototypes
118  *****************************************************************************/
119 static int  Demux  ( demux_t * );
120 static int  Control( demux_t *, int, va_list );
121
122 /* Bitstream manipulation */
123 static int  Ogg_ReadPage     ( demux_t *, ogg_page * );
124 static void Ogg_UpdatePCR    ( logical_stream_t *, ogg_packet * );
125 static void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * );
126
127 static int Ogg_BeginningOfStream( demux_t *p_demux );
128 static int Ogg_FindLogicalStreams( demux_t *p_demux );
129 static void Ogg_EndOfStream( demux_t *p_demux );
130
131 /* */
132 static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream );
133 static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream );
134
135 /* */
136 static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers );
137
138 /* Logical bitstream headers */
139 static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * );
140 static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * );
141 static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * );
142 static void Ogg_ReadKateHeader( logical_stream_t *, ogg_packet * );
143 static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * );
144 static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * );
145 static bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
146
147 /*****************************************************************************
148  * Open: initializes ogg demux structures
149  *****************************************************************************/
150 static int Open( vlc_object_t * p_this )
151 {
152     demux_t *p_demux = (demux_t *)p_this;
153     demux_sys_t    *p_sys;
154     const uint8_t  *p_peek;
155
156
157     /* Check if we are dealing with an ogg stream */
158     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
159     if( !p_demux->b_force && memcmp( p_peek, "OggS", 4 ) )
160     {
161         return VLC_EGENERIC;
162     }
163
164     /* Set exported functions */
165     p_demux->pf_demux = Demux;
166     p_demux->pf_control = Control;
167     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
168     if( !p_sys )
169         return VLC_ENOMEM;
170
171     memset( p_sys, 0, sizeof( demux_sys_t ) );
172     p_sys->i_bitrate = 0;
173     p_sys->pp_stream = NULL;
174     p_sys->p_old_stream = NULL;
175
176     /* Begnning of stream, tell the demux to look for elementary streams. */
177     p_sys->i_bos = 0;
178     p_sys->i_eos = 0;
179
180     /* Initialize the Ogg physical bitstream parser */
181     ogg_sync_init( &p_sys->oy );
182     p_sys->b_page_waiting = false;
183
184     /* */
185     p_sys->p_meta = NULL;
186
187     return VLC_SUCCESS;
188 }
189
190 /*****************************************************************************
191  * Close: frees unused data
192  *****************************************************************************/
193 static void Close( vlc_object_t *p_this )
194 {
195     demux_t *p_demux = (demux_t *)p_this;
196     demux_sys_t *p_sys = p_demux->p_sys  ;
197
198     /* Cleanup the bitstream parser */
199     ogg_sync_clear( &p_sys->oy );
200
201     Ogg_EndOfStream( p_demux );
202
203     if( p_sys->p_old_stream )
204         Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream );
205
206     free( p_sys );
207 }
208
209 /*****************************************************************************
210  * Demux: reads and demuxes data packets
211  *****************************************************************************
212  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
213  *****************************************************************************/
214 static int Demux( demux_t * p_demux )
215 {
216     demux_sys_t *p_sys = p_demux->p_sys;
217     ogg_packet  oggpacket;
218     int         i_stream;
219     bool b_skipping = false;
220
221
222     if( p_sys->i_eos == p_sys->i_streams )
223     {
224         if( p_sys->i_eos )
225         {
226             msg_Dbg( p_demux, "end of a group of logical streams" );
227             /* We keep the ES to try reusing it in Ogg_BeginningOfStream
228              * only 1 ES is supported (common case for ogg web radio) */
229             if( p_sys->i_streams == 1 )
230             {
231                 p_sys->p_old_stream = p_sys->pp_stream[0];
232                 TAB_CLEAN( p_sys->i_streams, p_sys->pp_stream );
233             }
234             Ogg_EndOfStream( p_demux );
235         }
236
237         p_sys->i_eos = 0;
238         if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS )
239             return 0;
240
241         msg_Dbg( p_demux, "beginning of a group of logical streams" );
242         es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
243     }
244
245     /*
246      * The first data page of a physical stream is stored in the relevant logical stream
247      * in Ogg_FindLogicalStreams. Therefore, we must not read a page and only update the
248      * stream it belongs to if we haven't processed this first page yet. If we do, we
249      * will only process that first page whenever we find the second page for this stream.
250      * While this is fine for Vorbis and Theora, which are continuous codecs, which means
251      * the second page will arrive real quick, this is not fine for Kate, whose second
252      * data page will typically arrive much later.
253      * This means it is now possible to seek right at the start of a stream where the last
254      * logical stream is Kate, without having to wait for the second data page to unblock
255      * the first one, which is the one that triggers the 'no more headers to backup' code.
256      * And, as we all know, seeking without having backed up all headers is bad, since the
257      * codec will fail to initialize if it's missing its headers.
258      */
259     if( !p_sys->b_page_waiting)
260     {
261         /*
262          * Demux an ogg page from the stream
263          */
264         if( Ogg_ReadPage( p_demux, &p_sys->current_page ) != VLC_SUCCESS )
265             return 0; /* EOF */
266
267         /* Test for End of Stream */
268         if( ogg_page_eos( &p_sys->current_page ) )
269             p_sys->i_eos++;
270     }
271
272
273     for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
274     {
275         logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
276
277         /* if we've just pulled page, look for the right logical stream */
278         if( !p_sys->b_page_waiting )
279         {
280             if( p_sys->i_streams == 1 &&
281                 ogg_page_serialno( &p_sys->current_page ) != p_stream->os.serialno )
282             {
283                 msg_Err( p_demux, "Broken Ogg stream (serialno) mismatch" );
284                 ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &p_sys->current_page ) );
285
286                 p_stream->b_reinit = true;
287                 p_stream->i_pcr = -1;
288                 p_stream->i_interpolated_pcr = -1;
289                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
290             }
291
292             if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 )
293             {
294                 continue;
295             }
296
297         }
298
299         while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
300         {
301             /* Read info from any secondary header packets, if there are any */
302             if( p_stream->i_secondary_header_packets > 0 )
303             {
304                 if( p_stream->fmt.i_codec == VLC_CODEC_THEORA &&
305                         oggpacket.bytes >= 7 &&
306                         ! memcmp( oggpacket.packet, "\x80theora", 7 ) )
307                 {
308                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
309                     p_stream->i_secondary_header_packets = 0;
310                 }
311                 else if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS &&
312                         oggpacket.bytes >= 7 &&
313                         ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
314                 {
315                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
316                     p_stream->i_secondary_header_packets = 0;
317                 }
318                 else if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
319                 {
320                     p_stream->i_secondary_header_packets = 0;
321                 }
322
323                 /* update start of data pointer */
324                 p_stream->i_data_start = stream_Tell( p_demux->s );
325
326             }
327
328             /* If any streams have i_skip_frames, only decode (pre-roll)
329              *  for those streams */
330             if ( b_skipping && p_stream->i_skip_frames == 0 ) continue;
331
332
333             if( p_stream->b_reinit )
334             {
335                 /* If synchro is re-initialized we need to drop all the packets
336                  * until we find a new dated one. */
337                 Ogg_UpdatePCR( p_stream, &oggpacket );
338
339                 if( p_stream->i_pcr >= 0 )
340                 {
341                     p_stream->b_reinit = false;
342                 }
343                 else
344                 {
345                     p_stream->i_interpolated_pcr = -1;
346                     continue;
347                 }
348
349                 /* An Ogg/vorbis packet contains an end date granulepos */
350                 if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
351                     p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
352                     p_stream->fmt.i_codec == VLC_CODEC_FLAC )
353                 {
354                     if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
355                     {
356                         Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
357                     }
358                     else
359                     {
360                         es_out_Control( p_demux->out, ES_OUT_SET_PCR,
361                                         VLC_TS_0 + p_stream->i_pcr );
362                     }
363                     continue;
364                 }
365             }
366
367             Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
368         }
369
370         if( !p_sys->b_page_waiting )
371             break;
372     }
373
374     /* if a page was waiting, it's now processed */
375     p_sys->b_page_waiting = false;
376
377     p_sys->i_pcr = -1;
378     for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
379     {
380         logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
381
382         if( p_stream->fmt.i_cat == SPU_ES )
383             continue;
384         if( p_stream->i_interpolated_pcr < 0 )
385             continue;
386
387         if( p_sys->i_pcr < 0 || p_stream->i_interpolated_pcr < p_sys->i_pcr )
388             p_sys->i_pcr = p_stream->i_interpolated_pcr;
389     }
390
391     if( p_sys->i_pcr >= 0 && ! b_skipping )
392         es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
393
394     return 1;
395 }
396
397 /*****************************************************************************
398  * Control:
399  *****************************************************************************/
400 static int Control( demux_t *p_demux, int i_query, va_list args )
401 {
402     demux_sys_t *p_sys  = p_demux->p_sys;
403     vlc_meta_t *p_meta;
404     int64_t *pi64;
405     bool *pb_bool;
406     int i;
407
408     switch( i_query )
409     {
410         case DEMUX_GET_META:
411             p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
412             if( p_sys->p_meta )
413                 vlc_meta_Merge( p_meta, p_sys->p_meta );
414             return VLC_SUCCESS;
415
416         case DEMUX_HAS_UNSUPPORTED_META:
417             pb_bool = (bool*)va_arg( args, bool* );
418             *pb_bool = true;
419             return VLC_SUCCESS;
420
421         case DEMUX_GET_TIME:
422             pi64 = (int64_t*)va_arg( args, int64_t * );
423             *pi64 = p_sys->i_pcr;
424             return VLC_SUCCESS;
425
426         case DEMUX_SET_TIME:
427             return VLC_EGENERIC;
428
429         case DEMUX_SET_POSITION:
430             /* forbid seeking if we haven't initialized all logical bitstreams yet;
431                if we allowed, some headers would not get backed up and decoder init
432                would fail, making that logical stream unusable */
433             if( p_sys->i_bos > 0 )
434             {
435                 return VLC_EGENERIC;
436             }
437
438             for( i = 0; i < p_sys->i_streams; i++ )
439             {
440                 logical_stream_t *p_stream = p_sys->pp_stream[i];
441
442                 /* we'll trash all the data until we find the next pcr */
443                 p_stream->b_reinit = true;
444                 p_stream->i_pcr = -1;
445                 p_stream->i_interpolated_pcr = -1;
446                 ogg_stream_reset( &p_stream->os );
447             }
448             ogg_sync_reset( &p_sys->oy );
449             /* XXX The break/return is missing on purpose as
450              * demux_vaControlHelper will do the last part of the job */
451
452         default:
453             return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
454                                            1, i_query, args );
455     }
456 }
457
458 /****************************************************************************
459  * Ogg_ReadPage: Read a full Ogg page from the physical bitstream.
460  ****************************************************************************
461  * Returns VLC_SUCCESS if a page has been read. An error might happen if we
462  * are at the end of stream.
463  ****************************************************************************/
464 static int Ogg_ReadPage( demux_t *p_demux, ogg_page *p_oggpage )
465 {
466     demux_sys_t *p_ogg = p_demux->p_sys  ;
467     int i_read = 0;
468     char *p_buffer;
469
470     while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
471     {
472         p_buffer = ogg_sync_buffer( &p_ogg->oy, OGGSEEK_BYTES_TO_READ );
473
474         i_read = stream_Read( p_demux->s, p_buffer, OGGSEEK_BYTES_TO_READ );
475         if( i_read <= 0 )
476             return VLC_EGENERIC;
477
478         ogg_sync_wrote( &p_ogg->oy, i_read );
479     }
480
481     return VLC_SUCCESS;
482 }
483
484 /****************************************************************************
485  * Ogg_UpdatePCR: update the PCR (90kHz program clock reference) for the
486  *                current stream.
487  ****************************************************************************/
488 static void Ogg_UpdatePCR( logical_stream_t *p_stream,
489                            ogg_packet *p_oggpacket )
490 {
491     /* Convert the granulepos into a pcr */
492     if( p_oggpacket->granulepos >= 0 )
493     {
494         if( p_stream->fmt.i_codec == VLC_CODEC_THEORA ||
495             p_stream->fmt.i_codec == VLC_CODEC_KATE )
496         {
497             ogg_int64_t iframe = p_oggpacket->granulepos >>
498               p_stream->i_granule_shift;
499             ogg_int64_t pframe = p_oggpacket->granulepos -
500               ( iframe << p_stream->i_granule_shift );
501
502             p_stream->i_pcr = ( iframe + pframe - p_stream->i_keyframe_offset )
503               * INT64_C(1000000) / p_stream->f_rate;
504         }
505         else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
506         {
507             ogg_int64_t i_dts = p_oggpacket->granulepos >> 31;
508             /* NB, OggDirac granulepos values are in units of 2*picturerate */
509             p_stream->i_pcr = (i_dts/2) * INT64_C(1000000) / p_stream->f_rate;
510         }
511         else
512         {
513             p_stream->i_pcr = p_oggpacket->granulepos * INT64_C(1000000)
514                               / p_stream->f_rate;
515         }
516
517         p_stream->i_pcr += 1;
518         p_stream->i_interpolated_pcr = p_stream->i_pcr;
519     }
520     else
521     {
522         p_stream->i_pcr = -1;
523
524         /* no granulepos available, try to interpolate the pcr.
525          * If we can't then don't touch the old value. */
526         if( p_stream->fmt.i_cat == VIDEO_ES )
527             /* 1 frame per packet */
528             p_stream->i_interpolated_pcr += (INT64_C(1000000) / p_stream->f_rate);
529         else if( p_stream->fmt.i_bitrate )
530             p_stream->i_interpolated_pcr +=
531                 ( p_oggpacket->bytes * INT64_C(1000000) /
532                   p_stream->fmt.i_bitrate / 8 );
533     }
534 }
535
536 /****************************************************************************
537  * Ogg_DecodePacket: Decode an Ogg packet.
538  ****************************************************************************/
539 static void Ogg_DecodePacket( demux_t *p_demux,
540                               logical_stream_t *p_stream,
541                               ogg_packet *p_oggpacket )
542 {
543     block_t *p_block;
544     bool b_selected;
545     int i_header_len = 0;
546     mtime_t i_pts = -1, i_interpolated_pts;
547     demux_sys_t *p_ogg = p_demux->p_sys;
548
549     /* Sanity check */
550     if( !p_oggpacket->bytes )
551     {
552         msg_Dbg( p_demux, "discarding 0 sized packet" );
553         return;
554     }
555
556     if( p_oggpacket->bytes >= 7 &&
557         ! memcmp ( p_oggpacket->packet, "Annodex", 7 ) )
558     {
559         /* it's an Annodex packet -- skip it (do nothing) */
560         return;
561     }
562     else if( p_oggpacket->bytes >= 7 &&
563         ! memcmp ( p_oggpacket->packet, "AnxData", 7 ) )
564     {
565         /* it's an AnxData packet -- skip it (do nothing) */
566         return;
567     }
568
569     if( p_stream->fmt.i_codec == VLC_CODEC_SUBT &&
570         p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return;
571
572     /* Check the ES is selected */
573     es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
574                     p_stream->p_es, &b_selected );
575
576     if( p_stream->b_force_backup )
577     {
578         bool b_xiph;
579         p_stream->i_packets_backup++;
580         switch( p_stream->fmt.i_codec )
581         {
582         case VLC_CODEC_VORBIS:
583         case VLC_CODEC_SPEEX:
584         case VLC_CODEC_THEORA:
585             if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
586             b_xiph = true;
587             break;
588
589         case VLC_CODEC_FLAC:
590             if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 )
591             {
592                 Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
593                 p_stream->b_force_backup = 0;
594             }
595             else if( p_stream->fmt.audio.i_rate )
596             {
597                 p_stream->b_force_backup = 0;
598                 if( p_oggpacket->bytes >= 9 )
599                 {
600                     p_oggpacket->packet += 9;
601                     p_oggpacket->bytes -= 9;
602                 }
603             }
604             b_xiph = false;
605             break;
606
607         case VLC_CODEC_KATE:
608             if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0;
609             b_xiph = true;
610             break;
611
612         default:
613             p_stream->b_force_backup = 0;
614             b_xiph = false;
615             break;
616         }
617
618         /* Backup the ogg packet (likely an header packet) */
619         if( !b_xiph )
620         {
621             void *p_org = p_stream->p_headers;
622             p_stream->i_headers += p_oggpacket->bytes;
623             p_stream->p_headers = realloc( p_stream->p_headers, p_stream->i_headers );
624             if( p_stream->p_headers )
625             {
626                 memcpy( (unsigned char *)p_stream->p_headers + p_stream->i_headers - p_oggpacket->bytes,
627                         p_oggpacket->packet, p_stream->i_headers );
628             }
629             else
630             {
631 #warning Memory leak
632                 p_stream->i_headers = 0;
633                 p_stream->p_headers = NULL;
634                 free( p_org );
635             }
636         }
637         else if( xiph_AppendHeaders( &p_stream->i_headers, &p_stream->p_headers,
638                                      p_oggpacket->bytes, p_oggpacket->packet ) )
639         {
640             p_stream->i_headers = 0;
641             p_stream->p_headers = NULL;
642         }
643         if( p_stream->i_headers > 0 )
644         {
645             if( !p_stream->b_force_backup )
646             {
647                 /* Last header received, commit changes */
648                 free( p_stream->fmt.p_extra );
649
650                 p_stream->fmt.i_extra = p_stream->i_headers;
651                 p_stream->fmt.p_extra = malloc( p_stream->i_headers );
652                 if( p_stream->fmt.p_extra )
653                     memcpy( p_stream->fmt.p_extra, p_stream->p_headers,
654                             p_stream->i_headers );
655                 else
656                     p_stream->fmt.i_extra = 0;
657
658                 if( Ogg_LogicalStreamResetEsFormat( p_demux, p_stream ) )
659                     es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
660                                     p_stream->p_es, &p_stream->fmt );
661
662                 if( p_stream->i_headers > 0 )
663                     Ogg_ExtractMeta( p_demux, p_stream->fmt.i_codec,
664                                      p_stream->p_headers, p_stream->i_headers );
665
666                 /* we're not at BOS anymore for this logical stream */
667                 p_ogg->i_bos--;
668             }
669         }
670
671         b_selected = false; /* Discard the header packet */
672     }
673
674     /* Convert the pcr into a pts */
675     if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
676         p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
677         p_stream->fmt.i_codec == VLC_CODEC_FLAC )
678     {
679         if( p_stream->i_pcr >= 0 )
680         {
681             /* This is for streams where the granulepos of the header packets
682              * doesn't match these of the data packets (eg. ogg web radios). */
683             if( p_stream->i_previous_pcr == 0 &&
684                 p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
685             {
686                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
687
688                 /* Call the pace control */
689                 es_out_Control( p_demux->out, ES_OUT_SET_PCR,
690                                 VLC_TS_0 + p_stream->i_pcr );
691             }
692
693             p_stream->i_previous_pcr = p_stream->i_pcr;
694
695             /* The granulepos is the end date of the sample */
696             i_pts =  p_stream->i_pcr;
697         }
698     }
699
700     /* Convert the granulepos into the next pcr */
701     i_interpolated_pts = p_stream->i_interpolated_pcr;
702     Ogg_UpdatePCR( p_stream, p_oggpacket );
703
704     /* SPU streams are typically discontinuous, do not mind large gaps */
705     if( p_stream->fmt.i_cat != SPU_ES )
706     {
707         if( p_stream->i_pcr >= 0 )
708         {
709             /* This is for streams where the granulepos of the header packets
710              * doesn't match these of the data packets (eg. ogg web radios). */
711             if( p_stream->i_previous_pcr == 0 &&
712                 p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
713             {
714                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
715
716                 /* Call the pace control */
717                 es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );
718             }
719         }
720     }
721
722     if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
723         p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
724         p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
725         p_stream->i_pcr >= 0 )
726     {
727         p_stream->i_previous_pcr = p_stream->i_pcr;
728
729         /* The granulepos is the start date of the sample */
730         i_pts = p_stream->i_pcr;
731     }
732
733     if( !b_selected )
734     {
735         /* This stream isn't currently selected so we don't need to decode it,
736          * but we did need to store its pcr as it might be selected later on */
737         return;
738     }
739
740     if( p_oggpacket->bytes <= 0 )
741         return;
742
743     if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
744
745
746     /* may need to preroll video frames after a seek */
747     if ( p_stream->i_skip_frames > 0 )
748     {
749         p_block->i_flags |= BLOCK_FLAG_PREROLL;
750         p_stream->i_skip_frames--;
751     }
752
753
754     /* Normalize PTS */
755     if( i_pts == 0 ) i_pts = VLC_TS_0;
756     else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = VLC_TS_0;
757     else if( i_pts == -1 ) i_pts = VLC_TS_INVALID;
758
759     if( p_stream->fmt.i_cat == AUDIO_ES )
760         p_block->i_dts = p_block->i_pts = i_pts;
761     else if( p_stream->fmt.i_cat == SPU_ES )
762     {
763         p_block->i_dts = p_block->i_pts = i_pts;
764         p_block->i_length = 0;
765     }
766     else if( p_stream->fmt.i_codec == VLC_CODEC_THEORA )
767     {
768         p_block->i_dts = p_block->i_pts = i_pts;
769         if( (p_oggpacket->granulepos & ((1<<p_stream->i_granule_shift)-1)) == 0 )
770         {
771             p_block->i_flags |= BLOCK_FLAG_TYPE_I;
772         }
773     }
774     else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
775     {
776         ogg_int64_t dts = p_oggpacket->granulepos >> 31;
777         ogg_int64_t delay = (p_oggpacket->granulepos >> 9) & 0x1fff;
778
779         uint64_t u_pnum = dts + delay;
780
781         p_block->i_dts = p_stream->i_pcr;
782         p_block->i_pts = VLC_TS_INVALID;
783         /* NB, OggDirac granulepos values are in units of 2*picturerate */
784
785         /* granulepos for dirac is possibly broken, this value should be ignored */
786         if( -1 != p_oggpacket->granulepos )
787             p_block->i_pts = u_pnum * INT64_C(1000000) / p_stream->f_rate / 2;
788     }
789     else
790     {
791         p_block->i_dts = i_pts;
792         p_block->i_pts = VLC_TS_INVALID;
793     }
794
795     if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
796         p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
797         p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
798         p_stream->fmt.i_codec != VLC_CODEC_TARKIN &&
799         p_stream->fmt.i_codec != VLC_CODEC_THEORA &&
800         p_stream->fmt.i_codec != VLC_CODEC_CMML &&
801         p_stream->fmt.i_codec != VLC_CODEC_DIRAC &&
802         p_stream->fmt.i_codec != VLC_CODEC_KATE )
803     {
804         /* We remove the header from the packet */
805         i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
806         i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
807
808         if( p_stream->fmt.i_codec == VLC_CODEC_SUBT)
809         {
810             /* But with subtitles we need to retrieve the duration first */
811             int i, lenbytes = 0;
812
813             if( i_header_len > 0 && p_oggpacket->bytes >= i_header_len + 1 )
814             {
815                 for( i = 0, lenbytes = 0; i < i_header_len; i++ )
816                 {
817                     lenbytes = lenbytes << 8;
818                     lenbytes += *(p_oggpacket->packet + i_header_len - i);
819                 }
820             }
821             if( p_oggpacket->bytes - 1 - i_header_len > 2 ||
822                 ( p_oggpacket->packet[i_header_len + 1] != ' ' &&
823                   p_oggpacket->packet[i_header_len + 1] != 0 &&
824                   p_oggpacket->packet[i_header_len + 1] != '\n' &&
825                   p_oggpacket->packet[i_header_len + 1] != '\r' ) )
826             {
827                 p_block->i_length = (mtime_t)lenbytes * 1000;
828             }
829         }
830
831         i_header_len++;
832         if( p_block->i_buffer >= (unsigned int)i_header_len )
833             p_block->i_buffer -= i_header_len;
834         else
835             p_block->i_buffer = 0;
836     }
837
838     if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN )
839     {
840         /* FIXME: the biggest hack I've ever done */
841         msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64,
842                   p_block->i_pts, p_block->i_dts );
843         msleep(10000);
844     }
845
846     memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len,
847             p_oggpacket->bytes - i_header_len );
848
849     es_out_Send( p_demux->out, p_stream->p_es, p_block );
850 }
851
852 /****************************************************************************
853  * Ogg_FindLogicalStreams: Find the logical streams embedded in the physical
854  *                         stream and fill p_ogg.
855  *****************************************************************************
856  * The initial page of a logical stream is marked as a 'bos' page.
857  * Furthermore, the Ogg specification mandates that grouped bitstreams begin
858  * together and all of the initial pages must appear before any data pages.
859  *
860  * On success this function returns VLC_SUCCESS.
861  ****************************************************************************/
862 static int Ogg_FindLogicalStreams( demux_t *p_demux )
863 {
864     demux_sys_t *p_ogg = p_demux->p_sys  ;
865     ogg_packet oggpacket;
866     int i_stream;
867
868     p_ogg->i_total_length = stream_Size ( p_demux->s );
869     msg_Dbg( p_demux, "File length is %"PRId64" bytes", p_ogg->i_total_length );
870
871
872     while( Ogg_ReadPage( p_demux, &p_ogg->current_page ) == VLC_SUCCESS )
873     {
874
875         if( ogg_page_bos( &p_ogg->current_page ) )
876         {
877
878             /* All is wonderful in our fine fine little world.
879              * We found the beginning of our first logical stream. */
880             while( ogg_page_bos( &p_ogg->current_page ) )
881             {
882                 logical_stream_t *p_stream;
883
884                 p_stream = malloc( sizeof(logical_stream_t) );
885                 if( !p_stream )
886                     return VLC_ENOMEM;
887
888                 TAB_APPEND( p_ogg->i_streams, p_ogg->pp_stream, p_stream );
889
890                 memset( p_stream, 0, sizeof(logical_stream_t) );
891                 p_stream->p_headers = 0;
892                 p_stream->i_secondary_header_packets = 0;
893
894                 p_stream->i_keyframe_offset = 0;
895                 p_stream->i_skip_frames = 0;
896
897                 p_stream->i_data_start = 0;
898
899                 es_format_Init( &p_stream->fmt, 0, 0 );
900                 es_format_Init( &p_stream->fmt_old, 0, 0 );
901
902                 /* Setup the logical stream */
903                 p_stream->i_serial_no = ogg_page_serialno( &p_ogg->current_page );
904                 ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
905
906                 /* Extract the initial header from the first page and verify
907                  * the codec type of this Ogg bitstream */
908                 if( ogg_stream_pagein( &p_stream->os, &p_ogg->current_page ) < 0 )
909                 {
910                     /* error. stream version mismatch perhaps */
911                     msg_Err( p_demux, "error reading first page of "
912                              "Ogg bitstream data" );
913                     return VLC_EGENERIC;
914                 }
915
916                 /* FIXME: check return value */
917                 ogg_stream_packetpeek( &p_stream->os, &oggpacket );
918
919                 /* Check for Vorbis header */
920                 if( oggpacket.bytes >= 7 &&
921                     ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
922                 {
923                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
924                     msg_Dbg( p_demux, "found vorbis header" );
925                 }
926                 /* Check for Speex header */
927                 else if( oggpacket.bytes >= 5 &&
928                     ! memcmp( oggpacket.packet, "Speex", 5 ) )
929                 {
930                     Ogg_ReadSpeexHeader( p_stream, &oggpacket );
931                     msg_Dbg( p_demux, "found speex header, channels: %i, "
932                              "rate: %i,  bitrate: %i",
933                              p_stream->fmt.audio.i_channels,
934                              (int)p_stream->f_rate, p_stream->fmt.i_bitrate );
935                 }
936                 /* Check for Flac header (< version 1.1.1) */
937                 else if( oggpacket.bytes >= 4 &&
938                     ! memcmp( oggpacket.packet, "fLaC", 4 ) )
939                 {
940                     msg_Dbg( p_demux, "found FLAC header" );
941
942                     /* Grrrr!!!! Did they really have to put all the
943                      * important info in the second header packet!!!
944                      * (STREAMINFO metadata is in the following packet) */
945                     p_stream->b_force_backup = 1;
946
947                     p_stream->fmt.i_cat = AUDIO_ES;
948                     p_stream->fmt.i_codec = VLC_CODEC_FLAC;
949                 }
950                 /* Check for Flac header (>= version 1.1.1) */
951                 else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F &&
952                     ! memcmp( &oggpacket.packet[1], "FLAC", 4 ) &&
953                     ! memcmp( &oggpacket.packet[9], "fLaC", 4 ) )
954                 {
955                     int i_packets = ((int)oggpacket.packet[7]) << 8 |
956                         oggpacket.packet[8];
957                     msg_Dbg( p_demux, "found FLAC header version %i.%i "
958                              "(%i header packets)",
959                              oggpacket.packet[5], oggpacket.packet[6],
960                              i_packets );
961
962                     p_stream->b_force_backup = 1;
963
964                     p_stream->fmt.i_cat = AUDIO_ES;
965                     p_stream->fmt.i_codec = VLC_CODEC_FLAC;
966                     oggpacket.packet += 13; oggpacket.bytes -= 13;
967                     Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket );
968                 }
969                 /* Check for Theora header */
970                 else if( oggpacket.bytes >= 7 &&
971                          ! memcmp( oggpacket.packet, "\x80theora", 7 ) )
972                 {
973                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
974
975                     msg_Dbg( p_demux,
976                              "found theora header, bitrate: %i, rate: %f",
977                              p_stream->fmt.i_bitrate, p_stream->f_rate );
978                 }
979                 /* Check for Dirac header */
980                 else if( ( oggpacket.bytes >= 5 &&
981                            ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) ||
982                          ( oggpacket.bytes >= 9 &&
983                            ! memcmp( oggpacket.packet, "KW-DIRAC\x00", 9 ) ) )
984                 {
985                     if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) )
986                         msg_Dbg( p_demux, "found dirac header" );
987                     else
988                     {
989                         msg_Warn( p_demux, "found dirac header isn't decodable" );
990                         free( p_stream );
991                         p_ogg->i_streams--;
992                     }
993                 }
994                 /* Check for Tarkin header */
995                 else if( oggpacket.bytes >= 7 &&
996                          ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) )
997                 {
998                     oggpack_buffer opb;
999
1000                     msg_Dbg( p_demux, "found tarkin header" );
1001                     p_stream->fmt.i_cat = VIDEO_ES;
1002                     p_stream->fmt.i_codec = VLC_CODEC_TARKIN;
1003
1004                     /* Cheat and get additionnal info ;) */
1005                     oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
1006                     oggpack_adv( &opb, 88 );
1007                     oggpack_adv( &opb, 104 );
1008                     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1009                     p_stream->f_rate = 2; /* FIXME */
1010                     msg_Dbg( p_demux,
1011                              "found tarkin header, bitrate: %i, rate: %f",
1012                              p_stream->fmt.i_bitrate, p_stream->f_rate );
1013                 }
1014                 /* Check for Annodex header */
1015                 else if( oggpacket.bytes >= 7 &&
1016                          ! memcmp( oggpacket.packet, "Annodex", 7 ) )
1017                 {
1018                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
1019                                            &oggpacket );
1020                     /* kill annodex track */
1021                     free( p_stream );
1022                     p_ogg->i_streams--;
1023                 }
1024                 /* Check for Annodex header */
1025                 else if( oggpacket.bytes >= 7 &&
1026                          ! memcmp( oggpacket.packet, "AnxData", 7 ) )
1027                 {
1028                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
1029                                            &oggpacket );
1030                 }
1031                 /* Check for Kate header */
1032                 else if( oggpacket.bytes >= 8 &&
1033                     ! memcmp( &oggpacket.packet[1], "kate\0\0\0", 7 ) )
1034                 {
1035                     Ogg_ReadKateHeader( p_stream, &oggpacket );
1036                     msg_Dbg( p_demux, "found kate header" );
1037                 }
1038                 else if( oggpacket.bytes >= 142 &&
1039                          !memcmp( &oggpacket.packet[1],
1040                                    "Direct Show Samples embedded in Ogg", 35 ))
1041                 {
1042                     /* Old header type */
1043
1044                     /* Check for video header (old format) */
1045                     if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 &&
1046                         oggpacket.bytes >= 184 )
1047                     {
1048                         p_stream->fmt.i_cat = VIDEO_ES;
1049                         p_stream->fmt.i_codec =
1050                             VLC_FOURCC( oggpacket.packet[68],
1051                                         oggpacket.packet[69],
1052                                         oggpacket.packet[70],
1053                                         oggpacket.packet[71] );
1054                         msg_Dbg( p_demux, "found video header of type: %.4s",
1055                                  (char *)&p_stream->fmt.i_codec );
1056
1057                         p_stream->fmt.video.i_frame_rate = 10000000;
1058                         p_stream->fmt.video.i_frame_rate_base =
1059                             GetQWLE((oggpacket.packet+164));
1060                         p_stream->f_rate = 10000000.0 /
1061                             GetQWLE((oggpacket.packet+164));
1062                         p_stream->fmt.video.i_bits_per_pixel =
1063                             GetWLE((oggpacket.packet+182));
1064                         if( !p_stream->fmt.video.i_bits_per_pixel )
1065                             /* hack, FIXME */
1066                             p_stream->fmt.video.i_bits_per_pixel = 24;
1067                         p_stream->fmt.video.i_width =
1068                             GetDWLE((oggpacket.packet+176));
1069                         p_stream->fmt.video.i_height =
1070                             GetDWLE((oggpacket.packet+180));
1071
1072                         msg_Dbg( p_demux,
1073                                  "fps: %f, width:%i; height:%i, bitcount:%i",
1074                                  p_stream->f_rate,
1075                                  p_stream->fmt.video.i_width,
1076                                  p_stream->fmt.video.i_height,
1077                                  p_stream->fmt.video.i_bits_per_pixel);
1078
1079                     }
1080                     /* Check for audio header (old format) */
1081                     else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
1082                     {
1083                         int i_extra_size;
1084                         unsigned int i_format_tag;
1085
1086                         p_stream->fmt.i_cat = AUDIO_ES;
1087
1088                         i_extra_size = GetWLE((oggpacket.packet+140));
1089                         if( i_extra_size > 0 && i_extra_size < oggpacket.bytes - 142 )
1090                         {
1091                             p_stream->fmt.i_extra = i_extra_size;
1092                             p_stream->fmt.p_extra = malloc( i_extra_size );
1093                             if( p_stream->fmt.p_extra )
1094                                 memcpy( p_stream->fmt.p_extra,
1095                                         oggpacket.packet + 142, i_extra_size );
1096                             else
1097                                 p_stream->fmt.i_extra = 0;
1098                         }
1099
1100                         i_format_tag = GetWLE((oggpacket.packet+124));
1101                         p_stream->fmt.audio.i_channels =
1102                             GetWLE((oggpacket.packet+126));
1103                         p_stream->f_rate = p_stream->fmt.audio.i_rate =
1104                             GetDWLE((oggpacket.packet+128));
1105                         p_stream->fmt.i_bitrate =
1106                             GetDWLE((oggpacket.packet+132)) * 8;
1107                         p_stream->fmt.audio.i_blockalign =
1108                             GetWLE((oggpacket.packet+136));
1109                         p_stream->fmt.audio.i_bitspersample =
1110                             GetWLE((oggpacket.packet+138));
1111
1112                         wf_tag_to_fourcc( i_format_tag,
1113                                           &p_stream->fmt.i_codec, 0 );
1114
1115                         if( p_stream->fmt.i_codec ==
1116                             VLC_FOURCC('u','n','d','f') )
1117                         {
1118                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
1119                                 ( i_format_tag >> 8 ) & 0xff,
1120                                 i_format_tag & 0xff );
1121                         }
1122
1123                         msg_Dbg( p_demux, "found audio header of type: %.4s",
1124                                  (char *)&p_stream->fmt.i_codec );
1125                         msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
1126                                  "%dbits/sample %dkb/s",
1127                                  i_format_tag,
1128                                  p_stream->fmt.audio.i_channels,
1129                                  p_stream->fmt.audio.i_rate,
1130                                  p_stream->fmt.audio.i_bitspersample,
1131                                  p_stream->fmt.i_bitrate / 1024 );
1132
1133                     }
1134                     else
1135                     {
1136                         msg_Dbg( p_demux, "stream %d has an old header "
1137                             "but is of an unknown type", p_ogg->i_streams-1 );
1138                         free( p_stream );
1139                         p_ogg->i_streams--;
1140                     }
1141                 }
1142                 else if( (*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER &&
1143                          oggpacket.bytes >= 44+1 )
1144                 {
1145                     stream_header_t tmp;
1146                     stream_header_t *st = &tmp;
1147
1148                     memcpy( st->streamtype, &oggpacket.packet[1+0], 8 );
1149                     memcpy( st->subtype, &oggpacket.packet[1+8], 4 );
1150                     st->size = GetDWLE( &oggpacket.packet[1+12] );
1151                     st->time_unit = GetQWLE( &oggpacket.packet[1+16] );
1152                     st->samples_per_unit = GetQWLE( &oggpacket.packet[1+24] );
1153                     st->default_len = GetDWLE( &oggpacket.packet[1+32] );
1154                     st->buffersize = GetDWLE( &oggpacket.packet[1+36] );
1155                     st->bits_per_sample = GetWLE( &oggpacket.packet[1+40] ); // (padding 2)
1156
1157                     /* Check for video header (new format) */
1158                     if( !strncmp( st->streamtype, "video", 5 ) &&
1159                         oggpacket.bytes >= 52+1 )
1160                     {
1161                         st->sh.video.width = GetDWLE( &oggpacket.packet[1+44] );
1162                         st->sh.video.height = GetDWLE( &oggpacket.packet[1+48] );
1163
1164                         p_stream->fmt.i_cat = VIDEO_ES;
1165
1166                         /* We need to get rid of the header packet */
1167                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1168
1169                         p_stream->fmt.i_codec =
1170                             VLC_FOURCC( st->subtype[0], st->subtype[1],
1171                                         st->subtype[2], st->subtype[3] );
1172                         msg_Dbg( p_demux, "found video header of type: %.4s",
1173                                  (char *)&p_stream->fmt.i_codec );
1174
1175                         p_stream->fmt.video.i_frame_rate = 10000000;
1176                         p_stream->fmt.video.i_frame_rate_base = st->time_unit;
1177                         if( st->time_unit <= 0 )
1178                             st->time_unit = 400000;
1179                         p_stream->f_rate = 10000000.0 / st->time_unit;
1180                         p_stream->fmt.video.i_bits_per_pixel = st->bits_per_sample;
1181                         p_stream->fmt.video.i_width = st->sh.video.width;
1182                         p_stream->fmt.video.i_height = st->sh.video.height;
1183
1184                         msg_Dbg( p_demux,
1185                                  "fps: %f, width:%i; height:%i, bitcount:%i",
1186                                  p_stream->f_rate,
1187                                  p_stream->fmt.video.i_width,
1188                                  p_stream->fmt.video.i_height,
1189                                  p_stream->fmt.video.i_bits_per_pixel );
1190                     }
1191                     /* Check for audio header (new format) */
1192                     else if( !strncmp( st->streamtype, "audio", 5 ) &&
1193                              oggpacket.bytes >= 56+1 )
1194                     {
1195                         char p_buffer[5];
1196                         int i_extra_size;
1197                         int i_format_tag;
1198
1199                         st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] );
1200                         st->sh.audio.blockalign = GetWLE( &oggpacket.packet[1+48] );
1201                         st->sh.audio.avgbytespersec = GetDWLE( &oggpacket.packet[1+52] );
1202
1203                         p_stream->fmt.i_cat = AUDIO_ES;
1204
1205                         /* We need to get rid of the header packet */
1206                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1207
1208                         i_extra_size = st->size - 56;
1209
1210                         if( i_extra_size > 0 &&
1211                             i_extra_size < oggpacket.bytes - 1 - 56 )
1212                         {
1213                             p_stream->fmt.i_extra = i_extra_size;
1214                             p_stream->fmt.p_extra = malloc( p_stream->fmt.i_extra );
1215                             if( p_stream->fmt.p_extra )
1216                                 memcpy( p_stream->fmt.p_extra, st + 1,
1217                                         p_stream->fmt.i_extra );
1218                             else
1219                                 p_stream->fmt.i_extra = 0;
1220                         }
1221
1222                         memcpy( p_buffer, st->subtype, 4 );
1223                         p_buffer[4] = '\0';
1224                         i_format_tag = strtol(p_buffer,NULL,16);
1225                         p_stream->fmt.audio.i_channels = st->sh.audio.channels;
1226                         if( st->time_unit <= 0 )
1227                             st->time_unit = 10000000;
1228                         p_stream->f_rate = p_stream->fmt.audio.i_rate = st->samples_per_unit * 10000000 / st->time_unit;
1229                         p_stream->fmt.i_bitrate = st->sh.audio.avgbytespersec * 8;
1230                         p_stream->fmt.audio.i_blockalign = st->sh.audio.blockalign;
1231                         p_stream->fmt.audio.i_bitspersample = st->bits_per_sample;
1232
1233                         wf_tag_to_fourcc( i_format_tag,
1234                                           &p_stream->fmt.i_codec, 0 );
1235
1236                         if( p_stream->fmt.i_codec ==
1237                             VLC_FOURCC('u','n','d','f') )
1238                         {
1239                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
1240                                 ( i_format_tag >> 8 ) & 0xff,
1241                                 i_format_tag & 0xff );
1242                         }
1243
1244                         msg_Dbg( p_demux, "found audio header of type: %.4s",
1245                                  (char *)&p_stream->fmt.i_codec );
1246                         msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
1247                                  "%dbits/sample %dkb/s",
1248                                  i_format_tag,
1249                                  p_stream->fmt.audio.i_channels,
1250                                  p_stream->fmt.audio.i_rate,
1251                                  p_stream->fmt.audio.i_bitspersample,
1252                                  p_stream->fmt.i_bitrate / 1024 );
1253                     }
1254                     /* Check for text (subtitles) header */
1255                     else if( !strncmp(st->streamtype, "text", 4) )
1256                     {
1257                         /* We need to get rid of the header packet */
1258                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1259
1260                         msg_Dbg( p_demux, "found text subtitles header" );
1261                         p_stream->fmt.i_cat = SPU_ES;
1262                         p_stream->fmt.i_codec = VLC_CODEC_SUBT;
1263                         p_stream->f_rate = 1000; /* granulepos is in millisec */
1264                     }
1265                     else
1266                     {
1267                         msg_Dbg( p_demux, "stream %d has a header marker "
1268                             "but is of an unknown type", p_ogg->i_streams-1 );
1269                         free( p_stream );
1270                         p_ogg->i_streams--;
1271                     }
1272                 }
1273                 else if( oggpacket.bytes >= 7 &&
1274                              ! memcmp( oggpacket.packet, "fishead", 7 ) )
1275
1276                 {
1277                     /* Skeleton */
1278                     msg_Dbg( p_demux, "stream %d is a skeleton",
1279                                 p_ogg->i_streams-1 );
1280                     /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */
1281                 }
1282                 else
1283                 {
1284                     msg_Dbg( p_demux, "stream %d is of unknown type",
1285                              p_ogg->i_streams-1 );
1286                     free( p_stream );
1287                     p_ogg->i_streams--;
1288                 }
1289
1290                 if( Ogg_ReadPage( p_demux, &p_ogg->current_page ) != VLC_SUCCESS )
1291                     return VLC_EGENERIC;
1292             }
1293
1294             /* we'll need to get all headers for all of those streams
1295                that we have to backup headers for */
1296             p_ogg->i_bos = 0;
1297             for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1298             {
1299                 if( p_ogg->pp_stream[i_stream]->b_force_backup )
1300                     p_ogg->i_bos++;
1301             }
1302
1303
1304             /* This is the first data page, which means we are now finished
1305              * with the initial pages. We just need to store it in the relevant
1306              * bitstream. */
1307             for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1308             {
1309                 if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
1310                                        &p_ogg->current_page ) == 0 )
1311                 {
1312                     p_ogg->b_page_waiting = true;
1313                     break;
1314                 }
1315             }
1316
1317             return VLC_SUCCESS;
1318         }
1319     }
1320
1321     return VLC_EGENERIC;
1322 }
1323
1324 /****************************************************************************
1325  * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
1326  *                        Elementary streams.
1327  ****************************************************************************/
1328 static int Ogg_BeginningOfStream( demux_t *p_demux )
1329 {
1330     demux_sys_t *p_ogg = p_demux->p_sys  ;
1331     logical_stream_t *p_old_stream = p_ogg->p_old_stream;
1332     int i_stream;
1333
1334     /* Find the logical streams embedded in the physical stream and
1335      * initialize our p_ogg structure. */
1336     if( Ogg_FindLogicalStreams( p_demux ) != VLC_SUCCESS )
1337     {
1338         msg_Warn( p_demux, "couldn't find any ogg logical stream" );
1339         return VLC_EGENERIC;
1340     }
1341
1342     p_ogg->i_bitrate = 0;
1343
1344     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1345     {
1346         logical_stream_t *p_stream = p_ogg->pp_stream[i_stream];
1347
1348         p_stream->p_es = NULL;
1349
1350         /* initialise kframe index */
1351         p_stream->idx=NULL;
1352
1353         /* Try first to reuse an old ES */
1354         if( p_old_stream &&
1355             p_old_stream->fmt.i_cat == p_stream->fmt.i_cat &&
1356             p_old_stream->fmt.i_codec == p_stream->fmt.i_codec )
1357         {
1358             msg_Dbg( p_demux, "will reuse old stream to avoid glitch" );
1359
1360             p_stream->p_es = p_old_stream->p_es;
1361             es_format_Copy( &p_stream->fmt_old, &p_old_stream->fmt );
1362
1363             p_old_stream->p_es = NULL;
1364             p_old_stream = NULL;
1365         }
1366
1367         if( !p_stream->p_es )
1368         {
1369             /* Better be safe than sorry when possible with ogm */
1370             if( p_stream->fmt.i_codec == VLC_CODEC_MPGA ||
1371                 p_stream->fmt.i_codec == VLC_CODEC_A52 )
1372                 p_stream->fmt.b_packetized = false;
1373
1374             p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt );
1375         }
1376
1377         // TODO: something to do here ?
1378         if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
1379         {
1380             /* Set the CMML stream active */
1381             es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es );
1382         }
1383
1384         p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
1385
1386         p_stream->i_pcr = p_stream->i_previous_pcr =
1387             p_stream->i_interpolated_pcr = -1;
1388         p_stream->b_reinit = false;
1389     }
1390
1391     if( p_ogg->p_old_stream )
1392     {
1393         if( p_ogg->p_old_stream->p_es )
1394             msg_Dbg( p_demux, "old stream not reused" );
1395         Ogg_LogicalStreamDelete( p_demux, p_ogg->p_old_stream );
1396         p_ogg->p_old_stream = NULL;
1397     }
1398
1399
1400     /* get total frame count for video stream; we will need this for seeking */
1401     p_ogg->i_total_frames = 0;
1402
1403     return VLC_SUCCESS;
1404 }
1405
1406 /****************************************************************************
1407  * Ogg_EndOfStream: clean up the ES when an End of Stream is detected.
1408  ****************************************************************************/
1409 static void Ogg_EndOfStream( demux_t *p_demux )
1410 {
1411     demux_sys_t *p_ogg = p_demux->p_sys  ;
1412     int i_stream;
1413
1414     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1415         Ogg_LogicalStreamDelete( p_demux, p_ogg->pp_stream[i_stream] );
1416     free( p_ogg->pp_stream );
1417
1418     /* Reinit p_ogg */
1419     p_ogg->i_bitrate = 0;
1420     p_ogg->i_streams = 0;
1421     p_ogg->pp_stream = NULL;
1422
1423     /* */
1424     if( p_ogg->p_meta )
1425         vlc_meta_Delete( p_ogg->p_meta );
1426     p_ogg->p_meta = NULL;
1427 }
1428
1429 /**
1430  * This function delete and release all data associated to a logical_stream_t
1431  */
1432 static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream )
1433 {
1434     if( p_stream->p_es )
1435         es_out_Del( p_demux->out, p_stream->p_es );
1436
1437     ogg_stream_clear( &p_stream->os );
1438     free( p_stream->p_headers );
1439
1440     es_format_Clean( &p_stream->fmt_old );
1441     es_format_Clean( &p_stream->fmt );
1442
1443     if ( p_stream->idx != NULL)
1444     {
1445         oggseek_index_entries_free( p_stream->idx );
1446     }
1447
1448     free( p_stream );
1449 }
1450 /**
1451  * This function check if a we need to reset a decoder in case we are
1452  * reusing an old ES
1453  */
1454 static bool Ogg_IsVorbisFormatCompatible( const es_format_t *p_new, const es_format_t *p_old )
1455 {
1456     unsigned pi_new_size[XIPH_MAX_HEADER_COUNT];
1457     void     *pp_new_data[XIPH_MAX_HEADER_COUNT];
1458     unsigned i_new_count;
1459     if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
1460         i_new_count = 0;
1461
1462     unsigned pi_old_size[XIPH_MAX_HEADER_COUNT];
1463     void     *pp_old_data[XIPH_MAX_HEADER_COUNT];
1464     unsigned i_old_count;
1465     if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) )
1466         i_old_count = 0;
1467
1468     bool b_match = i_new_count == i_old_count;
1469     for( unsigned i = 0; i < i_new_count && b_match; i++ )
1470     {
1471         /* Ignore vorbis comment */
1472         if( i == 1 )
1473             continue;
1474         if( pi_new_size[i] != pi_old_size[i] ||
1475             memcmp( pp_new_data[i], pp_old_data[i], pi_new_size[i] ) )
1476             b_match = false;
1477     }
1478
1479     for( unsigned i = 0; i < i_new_count; i++ )
1480         free( pp_new_data[i] );
1481     for( unsigned i = 0; i < i_old_count; i++ )
1482         free( pp_old_data[i] );
1483     return b_match;
1484 }
1485 static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream )
1486 {
1487     bool b_compatible = false;
1488     if( !p_stream->fmt_old.i_cat || !p_stream->fmt_old.i_codec )
1489         return true;
1490
1491     /* Only vorbis is supported */
1492     if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS )
1493         b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old );
1494
1495     if( !b_compatible )
1496         msg_Warn( p_demux, "cannot reuse old stream, resetting the decoder" );
1497
1498     return !b_compatible;
1499 }
1500 static void Ogg_ExtractXiphMeta( demux_t *p_demux, const void *p_headers, unsigned i_headers, unsigned i_skip )
1501 {
1502     demux_sys_t *p_ogg = p_demux->p_sys;
1503
1504     unsigned pi_size[XIPH_MAX_HEADER_COUNT];
1505     void     *pp_data[XIPH_MAX_HEADER_COUNT];
1506     unsigned i_count;
1507     if( xiph_SplitHeaders( pi_size, pp_data, &i_count, i_headers, p_headers ) )
1508         return;
1509
1510     /* TODO how to handle multiple comments properly ? */
1511     if( i_count >= 2 && pi_size[1] > i_skip )
1512         vorbis_ParseComment( &p_ogg->p_meta, (uint8_t*)pp_data[1] + i_skip, pi_size[1] - i_skip );
1513
1514     for( unsigned i = 0; i < i_count; i++ )
1515         free( pp_data[i] );
1516 }
1517 static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers )
1518 {
1519     demux_sys_t *p_ogg = p_demux->p_sys;
1520
1521     switch( i_codec )
1522     {
1523     /* 3 headers with the 2° one being the comments */
1524     case VLC_CODEC_VORBIS:
1525         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
1526         break;
1527     case VLC_CODEC_THEORA:
1528         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
1529         break;
1530     case VLC_CODEC_SPEEX:
1531         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 );
1532         break;
1533
1534     /* N headers with the 2° one being the comments */
1535     case VLC_CODEC_KATE:
1536         /* 1 byte for header type, 7 bytes for magic, 1 reserved zero byte */
1537         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+7+1 );
1538         break;
1539
1540     /* TODO */
1541     case VLC_CODEC_FLAC:
1542         msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&i_codec );
1543         break;
1544
1545     /* No meta data */
1546     case VLC_CODEC_CMML: /* CMML is XML text, doesn't have Vorbis comments */
1547     case VLC_CODEC_DIRAC:
1548     default:
1549         break;
1550     }
1551     if( p_ogg->p_meta )
1552         p_demux->info.i_update |= INPUT_UPDATE_META;
1553 }
1554
1555 static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream,
1556                                   ogg_packet *p_oggpacket )
1557 {
1558     bs_t bitstream;
1559     int i_fps_numerator;
1560     int i_fps_denominator;
1561     int i_keyframe_frequency_force;
1562     int i_major;
1563     int i_minor;
1564     int i_subminor;
1565     int i_version;
1566
1567     p_stream->fmt.i_cat = VIDEO_ES;
1568     p_stream->fmt.i_codec = VLC_CODEC_THEORA;
1569
1570     /* Signal that we want to keep a backup of the theora
1571      * stream headers. They will be used when switching between
1572      * audio streams. */
1573     p_stream->b_force_backup = 1;
1574
1575     /* Cheat and get additionnal info ;) */
1576     bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes );
1577     bs_skip( &bitstream, 56 );
1578
1579     i_major = bs_read( &bitstream, 8 ); /* major version num */
1580     i_minor = bs_read( &bitstream, 8 ); /* minor version num */
1581     i_subminor = bs_read( &bitstream, 8 ); /* subminor version num */
1582
1583     bs_read( &bitstream, 16 ) /*<< 4*/; /* width */
1584     bs_read( &bitstream, 16 ) /*<< 4*/; /* height */
1585     bs_read( &bitstream, 24 ); /* frame width */
1586     bs_read( &bitstream, 24 ); /* frame height */
1587     bs_read( &bitstream, 8 ); /* x offset */
1588     bs_read( &bitstream, 8 ); /* y offset */
1589
1590     i_fps_numerator = bs_read( &bitstream, 32 );
1591     i_fps_denominator = bs_read( &bitstream, 32 );
1592     bs_read( &bitstream, 24 ); /* aspect_numerator */
1593     bs_read( &bitstream, 24 ); /* aspect_denominator */
1594
1595     p_stream->fmt.video.i_frame_rate = i_fps_numerator;
1596     p_stream->fmt.video.i_frame_rate_base = i_fps_denominator;
1597
1598     bs_read( &bitstream, 8 ); /* colorspace */
1599     p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 );
1600     bs_read( &bitstream, 6 ); /* quality */
1601
1602     i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 );
1603
1604     /* granule_shift = i_log( frequency_force -1 ) */
1605     p_stream->i_granule_shift = 0;
1606     i_keyframe_frequency_force--;
1607     while( i_keyframe_frequency_force )
1608     {
1609         p_stream->i_granule_shift++;
1610         i_keyframe_frequency_force >>= 1;
1611     }
1612
1613     i_version = i_major * 1000000 + i_minor * 1000 + i_subminor;
1614     p_stream->i_keyframe_offset = 0;
1615
1616     if ( i_version >= 3002001 )
1617     {
1618         p_stream->i_keyframe_offset = 1;
1619     }
1620
1621     p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator;
1622 }
1623
1624 static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream,
1625                                   ogg_packet *p_oggpacket )
1626 {
1627     oggpack_buffer opb;
1628
1629     p_stream->fmt.i_cat = AUDIO_ES;
1630     p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
1631
1632     /* Signal that we want to keep a backup of the vorbis
1633      * stream headers. They will be used when switching between
1634      * audio streams. */
1635     p_stream->b_force_backup = 1;
1636
1637     /* Cheat and get additionnal info ;) */
1638     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1639     oggpack_adv( &opb, 88 );
1640     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
1641     p_stream->f_rate = p_stream->fmt.audio.i_rate =
1642         oggpack_read( &opb, 32 );
1643     oggpack_adv( &opb, 32 );
1644     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1645 }
1646
1647 static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream,
1648                                  ogg_packet *p_oggpacket )
1649 {
1650     oggpack_buffer opb;
1651
1652     p_stream->fmt.i_cat = AUDIO_ES;
1653     p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
1654
1655     /* Signal that we want to keep a backup of the speex
1656      * stream headers. They will be used when switching between
1657      * audio streams. */
1658     p_stream->b_force_backup = 1;
1659
1660     /* Cheat and get additionnal info ;) */
1661     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1662     oggpack_adv( &opb, 224 );
1663     oggpack_adv( &opb, 32 ); /* speex_version_id */
1664     oggpack_adv( &opb, 32 ); /* header_size */
1665     p_stream->f_rate = p_stream->fmt.audio.i_rate = oggpack_read( &opb, 32 );
1666     oggpack_adv( &opb, 32 ); /* mode */
1667     oggpack_adv( &opb, 32 ); /* mode_bitstream_version */
1668     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 );
1669     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1670 }
1671
1672 static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream,
1673                                 ogg_packet *p_oggpacket )
1674 {
1675     /* Parse the STREAMINFO metadata */
1676     bs_t s;
1677
1678     bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes );
1679
1680     bs_read( &s, 1 );
1681     if( bs_read( &s, 7 ) == 0 )
1682     {
1683         if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ )
1684         {
1685             bs_skip( &s, 80 );
1686             p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 );
1687             p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1;
1688
1689             msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
1690                      p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
1691         }
1692         else
1693         {
1694             msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
1695         }
1696
1697         /* Fake this as the last metadata block */
1698         *((uint8_t*)p_oggpacket->packet) |= 0x80;
1699     }
1700     else
1701     {
1702         /* This ain't a STREAMINFO metadata */
1703         msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" );
1704     }
1705 }
1706
1707 static void Ogg_ReadKateHeader( logical_stream_t *p_stream,
1708                                 ogg_packet *p_oggpacket )
1709 {
1710     oggpack_buffer opb;
1711     int32_t gnum;
1712     int32_t gden;
1713     int n;
1714     char *psz_desc;
1715
1716     p_stream->fmt.i_cat = SPU_ES;
1717     p_stream->fmt.i_codec = VLC_CODEC_KATE;
1718
1719     /* Signal that we want to keep a backup of the kate
1720      * stream headers. They will be used when switching between
1721      * kate streams. */
1722     p_stream->b_force_backup = 1;
1723
1724     /* Cheat and get additionnal info ;) */
1725     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1726     oggpack_adv( &opb, 11*8 ); /* packet type, kate magic, version */
1727     p_stream->i_kate_num_headers = oggpack_read( &opb, 8 );
1728     oggpack_adv( &opb, 3*8 );
1729     p_stream->i_granule_shift = oggpack_read( &opb, 8 );
1730     oggpack_adv( &opb, 8*8 ); /* reserved */
1731     gnum = oggpack_read( &opb, 32 );
1732     gden = oggpack_read( &opb, 32 );
1733     p_stream->f_rate = (double)gnum/gden;
1734
1735     p_stream->fmt.psz_language = malloc(16);
1736     if( p_stream->fmt.psz_language )
1737     {
1738         for( n = 0; n < 16; n++ )
1739             p_stream->fmt.psz_language[n] = oggpack_read(&opb,8);
1740         p_stream->fmt.psz_language[15] = 0; /* just in case */
1741     }
1742     else
1743     {
1744         for( n = 0; n < 16; n++ )
1745             oggpack_read(&opb,8);
1746     }
1747     p_stream->fmt.psz_description = malloc(16);
1748     if( p_stream->fmt.psz_description )
1749     {
1750         for( n = 0; n < 16; n++ )
1751             p_stream->fmt.psz_description[n] = oggpack_read(&opb,8);
1752         p_stream->fmt.psz_description[15] = 0; /* just in case */
1753
1754         /* Now find a localized user readable description for this category */
1755         psz_desc = strdup(FindKateCategoryName(p_stream->fmt.psz_description));
1756         if( psz_desc )
1757         {
1758             free( p_stream->fmt.psz_description );
1759             p_stream->fmt.psz_description = psz_desc;
1760         }
1761     }
1762     else
1763     {
1764         for( n = 0; n < 16; n++ )
1765             oggpack_read(&opb,8);
1766     }
1767 }
1768
1769 static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
1770                                    logical_stream_t *p_stream,
1771                                    ogg_packet *p_oggpacket )
1772 {
1773     if( p_oggpacket->bytes >= 28 &&
1774         !memcmp( p_oggpacket->packet, "Annodex", 7 ) )
1775     {
1776         oggpack_buffer opb;
1777
1778         uint16_t major_version;
1779         uint16_t minor_version;
1780         uint64_t timebase_numerator;
1781         uint64_t timebase_denominator;
1782
1783         Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
1784
1785         oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1786         oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
1787         major_version = oggpack_read( &opb, 2*8 ); /* major version */
1788         minor_version = oggpack_read( &opb, 2*8 ); /* minor version */
1789         timebase_numerator = GetQWLE( &p_oggpacket->packet[16] );
1790         timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
1791     }
1792     else if( p_oggpacket->bytes >= 42 &&
1793              !memcmp( p_oggpacket->packet, "AnxData", 7 ) )
1794     {
1795         uint64_t granule_rate_numerator;
1796         uint64_t granule_rate_denominator;
1797         char content_type_string[1024];
1798
1799         /* Read in Annodex header fields */
1800
1801         granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] );
1802         granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] );
1803         p_stream->i_secondary_header_packets =
1804             GetDWLE( &p_oggpacket->packet[24] );
1805
1806         /* we are guaranteed that the first header field will be
1807          * the content-type (by the Annodex standard) */
1808         content_type_string[0] = '\0';
1809         if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) )
1810         {
1811             uint8_t *p = memchr( &p_oggpacket->packet[42], '\r',
1812                                  p_oggpacket->bytes - 1 );
1813             if( p && p[0] == '\r' && p[1] == '\n' )
1814                 sscanf( (char*)(&p_oggpacket->packet[42]), "%1023s\r\n",
1815                         content_type_string );
1816         }
1817
1818         msg_Dbg( p_this, "AnxData packet info: %"PRId64" / %"PRId64", %d, ``%s''",
1819                  granule_rate_numerator, granule_rate_denominator,
1820                  p_stream->i_secondary_header_packets, content_type_string );
1821
1822         p_stream->f_rate = (float) granule_rate_numerator /
1823             (float) granule_rate_denominator;
1824
1825         /* What type of file do we have?
1826          * strcmp is safe to use here because we've extracted
1827          * content_type_string from the stream manually */
1828         if( !strncmp(content_type_string, "audio/x-wav", 11) )
1829         {
1830             /* n.b. WAVs are unsupported right now */
1831             p_stream->fmt.i_cat = UNKNOWN_ES;
1832         }
1833         else if( !strncmp(content_type_string, "audio/x-vorbis", 14) )
1834         {
1835             p_stream->fmt.i_cat = AUDIO_ES;
1836             p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
1837
1838             p_stream->b_force_backup = 1;
1839         }
1840         else if( !strncmp(content_type_string, "audio/x-speex", 13) )
1841         {
1842             p_stream->fmt.i_cat = AUDIO_ES;
1843             p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
1844
1845             p_stream->b_force_backup = 1;
1846         }
1847         else if( !strncmp(content_type_string, "video/x-theora", 14) )
1848         {
1849             p_stream->fmt.i_cat = VIDEO_ES;
1850             p_stream->fmt.i_codec = VLC_CODEC_THEORA;
1851
1852             p_stream->b_force_backup = 1;
1853         }
1854         else if( !strncmp(content_type_string, "video/x-xvid", 12) )
1855         {
1856             p_stream->fmt.i_cat = VIDEO_ES;
1857             p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' );
1858
1859             p_stream->b_force_backup = 1;
1860         }
1861         else if( !strncmp(content_type_string, "video/mpeg", 10) )
1862         {
1863             /* n.b. MPEG streams are unsupported right now */
1864             p_stream->fmt.i_cat = VIDEO_ES;
1865             p_stream->fmt.i_codec = VLC_CODEC_MPGV;
1866         }
1867         else if( !strncmp(content_type_string, "text/x-cmml", 11) )
1868         {
1869             ogg_stream_packetout( &p_stream->os, p_oggpacket );
1870             p_stream->fmt.i_cat = SPU_ES;
1871             p_stream->fmt.i_codec = VLC_CODEC_CMML;
1872         }
1873     }
1874 }
1875
1876 static uint32_t dirac_uint( bs_t *p_bs )
1877 {
1878     uint32_t u_count = 0, u_value = 0;
1879
1880     while( !bs_eof( p_bs ) && !bs_read( p_bs, 1 ) )
1881     {
1882         u_count++;
1883         u_value <<= 1;
1884         u_value |= bs_read( p_bs, 1 );
1885     }
1886
1887     return (1<<u_count) - 1 + u_value;
1888 }
1889
1890 static int dirac_bool( bs_t *p_bs )
1891 {
1892     return bs_read( p_bs, 1 );
1893 }
1894
1895 static bool Ogg_ReadDiracHeader( logical_stream_t *p_stream,
1896                                  ogg_packet *p_oggpacket )
1897 {
1898     static const struct {
1899         uint32_t u_n /* numerator */, u_d /* denominator */;
1900     } p_dirac_frate_tbl[] = { /* table 10.3 */
1901         {1,1}, /* this first value is never used */
1902         {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
1903         {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2},
1904     };
1905     static const size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl);
1906
1907     static const uint32_t pu_dirac_vidfmt_frate[] = { /* table C.1 */
1908         1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6,
1909     };
1910     static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate);
1911
1912     bs_t bs;
1913
1914     p_stream->i_granule_shift = 22; /* not 32 */
1915
1916     /* Backing up stream headers is not required -- seqhdrs are repeated
1917      * thoughout the stream at suitable decoding start points */
1918     p_stream->b_force_backup = 0;
1919
1920     /* read in useful bits from sequence header */
1921     bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes );
1922     bs_skip( &bs, 13*8); /* parse_info_header */
1923     dirac_uint( &bs ); /* major_version */
1924     dirac_uint( &bs ); /* minor_version */
1925     dirac_uint( &bs ); /* profile */
1926     dirac_uint( &bs ); /* level */
1927
1928     uint32_t u_video_format = dirac_uint( &bs ); /* index */
1929     if( u_video_format >= u_dirac_vidfmt_frate )
1930     {
1931         /* don't know how to parse this ogg dirac stream */
1932         return false;
1933     }
1934
1935     if( dirac_bool( &bs ) )
1936     {
1937         dirac_uint( &bs ); /* frame_width */
1938         dirac_uint( &bs ); /* frame_height */
1939     }
1940
1941     if( dirac_bool( &bs ) )
1942     {
1943         dirac_uint( &bs ); /* chroma_format */
1944     }
1945
1946     if( dirac_bool( &bs ) )
1947     {
1948         dirac_uint( &bs ); /* scan_format */
1949     }
1950
1951     uint32_t u_n = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_n;
1952     uint32_t u_d = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_d;
1953     if( dirac_bool( &bs ) )
1954     {
1955         uint32_t u_frame_rate_index = dirac_uint( &bs );
1956         if( u_frame_rate_index >= u_dirac_frate_tbl )
1957         {
1958             /* something is wrong with this stream */
1959             return false;
1960         }
1961         u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n;
1962         u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d;
1963         if( u_frame_rate_index == 0 )
1964         {
1965             u_n = dirac_uint( &bs ); /* frame_rate_numerator */
1966             u_d = dirac_uint( &bs ); /* frame_rate_denominator */
1967         }
1968     }
1969     p_stream->f_rate = (float) u_n / u_d;
1970
1971     /* probably is an ogg dirac es */
1972     p_stream->fmt.i_cat = VIDEO_ES;
1973     p_stream->fmt.i_codec = VLC_CODEC_DIRAC;
1974
1975     return true;
1976 }