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