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