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-2003 VideoLAN
   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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  23  *****************************************************************************/
  24
  25 /*****************************************************************************
  26  * Preamble
  27  *****************************************************************************/
  28 #include <vlc/vlc.h>
  29 #include <vlc/input.h>
  30
  31 #include <ogg/ogg.h>
  32
  33 #include "codecs.h"
  34 #include "vlc_bits.h"
  35
  36 /*****************************************************************************
  37  * Module descriptor
  38  *****************************************************************************/
  39 static int  Open ( vlc_object_t * );
  40 static void Close( vlc_object_t * );
  41
  42 vlc_module_begin();
  43     set_description( _("Ogg stream demuxer" ) );
  44     set_category( CAT_INPUT );
  45     set_subcategory( SUBCAT_INPUT_DEMUX );
  46     set_capability( "demux2", 50 );
  47     set_callbacks( Open, Close );
  48     add_shortcut( "ogg" );
  49 vlc_module_end();
  50
  51
  52 /*****************************************************************************
  53  * Definitions of structures and functions used by this plugins
  54  *****************************************************************************/
  55 typedef struct logical_stream_s
  56 {
  57     ogg_stream_state os;                        /* logical stream of packets */
  58
  59     es_format_t      fmt;
  60     es_out_id_t      *p_es;
  61     double           f_rate;
  62
  63     int              i_serial_no;
  64
  65     /* the header of some logical streams (eg vorbis) contain essential
  66      * data for the decoder. We back them up here in case we need to re-feed
  67      * them to the decoder. */
  68     int              b_force_backup;
  69     int              i_packets_backup;
  70     uint8_t          *p_headers;
  71     int              i_headers;
  72
  73     /* program clock reference (in units of 90kHz) derived from the previous
  74      * granulepos */
  75     mtime_t          i_pcr;
  76     mtime_t          i_interpolated_pcr;
  77     mtime_t          i_previous_pcr;
  78
  79     /* Misc */
  80     int b_reinit;
  81     int i_theora_keyframe_granule_shift;
  82
  83     /* for Annodex logical bitstreams */
  84     int secondary_header_packets;
  85
  86 } logical_stream_t;
  87
  88 struct demux_sys_t
  89 {
  90     ogg_sync_state oy;        /* sync and verify incoming physical bitstream */
  91
  92     int i_streams;                           /* number of logical bitstreams */
  93     logical_stream_t **pp_stream;  /* pointer to an array of logical streams */
  94
  95     /* program clock reference (in units of 90kHz) derived from the pcr of
  96      * the sub-streams */
  97     mtime_t i_pcr;
  98
  99     /* stream state */
 100     int     i_eos;
 101
 102     /* bitrate */
 103     int     i_bitrate;
 104 };
 105
 106 /* OggDS headers for the new header format (used in ogm files) */
 107 typedef struct stream_header_video
 108 {
 109     ogg_int32_t width;
 110     ogg_int32_t height;
 111 } stream_header_video;
 112
 113 typedef struct stream_header_audio
 114 {
 115     ogg_int16_t channels;
 116     ogg_int16_t blockalign;
 117     ogg_int32_t avgbytespersec;
 118 } stream_header_audio;
 119
 120 typedef struct stream_header
 121 {
 122     char        streamtype[8];
 123     char        subtype[4];
 124
 125     ogg_int32_t size;                               /* size of the structure */
 126
 127     ogg_int64_t time_unit;                              /* in reference time */
 128     ogg_int64_t samples_per_unit;
 129     ogg_int32_t default_len;                                /* in media time */
 130
 131     ogg_int32_t buffersize;
 132     ogg_int16_t bits_per_sample;
 133
 134     union
 135     {
 136         /* Video specific */
 137         stream_header_video video;
 138         /* Audio specific */
 139         stream_header_audio audio;
 140     } sh;
 141 } stream_header;
 142
 143 #define OGG_BLOCK_SIZE 4096
 144
 145 /* Some defines from OggDS */
 146 #define PACKET_TYPE_HEADER   0x01
 147 #define PACKET_TYPE_BITS     0x07
 148 #define PACKET_LEN_BITS01    0xc0
 149 #define PACKET_LEN_BITS2     0x02
 150 #define PACKET_IS_SYNCPOINT  0x08
 151
 152 /*****************************************************************************
 153  * Local prototypes
 154  *****************************************************************************/
 155 static int  Demux  ( demux_t * );
 156 static int  Control( demux_t *, int, va_list );
 157
 158 /* Bitstream manipulation */
 159 static int  Ogg_ReadPage     ( demux_t *, ogg_page * );
 160 static void Ogg_UpdatePCR    ( logical_stream_t *, ogg_packet * );
 161 static void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * );
 162
 163 static int Ogg_BeginningOfStream( demux_t *p_demux );
 164 static int Ogg_FindLogicalStreams( demux_t *p_demux );
 165 static void Ogg_EndOfStream( demux_t *p_demux );
 166
 167 /* Logical bitstream headers */
 168 static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * );
 169 static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * );
 170 static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * );
 171 static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * );
 172 static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * );
 173
 174 /*****************************************************************************
 175  * Open: initializes ogg demux structures
 176  *****************************************************************************/
 177 static int Open( vlc_object_t * p_this )
 178 {
 179     demux_t *p_demux = (demux_t *)p_this;
 180     demux_sys_t    *p_sys;
 181     uint8_t        *p_peek;
 182
 183
 184     /* Check if we are dealing with an ogg stream */
 185     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
 186     {
 187         msg_Err( p_demux, "cannot peek" );
 188         return VLC_EGENERIC;
 189     }
 190     if( strcmp( p_demux->psz_demux, "ogg" ) && strncmp( p_peek, "OggS", 4 ) )
 191     {
 192         msg_Warn( p_demux, "ogg module discarded (invalid header)" );
 193         return VLC_EGENERIC;
 194     }
 195
 196     /* Set exported functions */
 197     p_demux->pf_demux = Demux;
 198     p_demux->pf_control = Control;
 199     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
 200
 201     memset( p_sys, 0, sizeof( demux_sys_t ) );
 202     p_sys->i_bitrate = 0;
 203     p_sys->pp_stream = NULL;
 204
 205     /* Begnning of stream, tell the demux to look for elementary streams. */
 206     p_sys->i_eos = 0;
 207
 208     /* Initialize the Ogg physical bitstream parser */
 209     ogg_sync_init( &p_sys->oy );
 210
 211     return VLC_SUCCESS;
 212 }
 213
 214 /*****************************************************************************
 215  * Close: frees unused data
 216  *****************************************************************************/
 217 static void Close( vlc_object_t *p_this )
 218 {
 219     demux_t *p_demux = (demux_t *)p_this;
 220     demux_sys_t *p_sys = p_demux->p_sys  ;
 221
 222     /* Cleanup the bitstream parser */
 223     ogg_sync_clear( &p_sys->oy );
 224
 225     Ogg_EndOfStream( p_demux );
 226
 227     free( p_sys );
 228 }
 229
 230 /*****************************************************************************
 231  * Demux: reads and demuxes data packets
 232  *****************************************************************************
 233  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
 234  *****************************************************************************/
 235 static int Demux( demux_t * p_demux )
 236 {
 237     demux_sys_t *p_sys = p_demux->p_sys;
 238     ogg_page    oggpage;
 239     ogg_packet  oggpacket;
 240     int         i_stream;
 241
 242
 243     if( p_sys->i_eos == p_sys->i_streams )
 244     {
 245         if( p_sys->i_eos )
 246         {
 247             msg_Dbg( p_demux, "end of a group of logical streams" );
 248             Ogg_EndOfStream( p_demux );
 249         }
 250
 251         p_sys->i_eos = 0;
 252         if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS ) return 0;
 253
 254         msg_Dbg( p_demux, "beginning of a group of logical streams" );
 255         es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 256     }
 257
 258     /*
 259      * Demux an ogg page from the stream
 260      */
 261     if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
 262     {
 263         return 0; /* EOF */
 264     }
 265
 266     /* Test for End of Stream */
 267     if( ogg_page_eos( &oggpage ) ) p_sys->i_eos++;
 268
 269
 270     for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
 271     {
 272         logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
 273
 274         if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
 275             continue;
 276
 277         while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
 278         {
 279             /* Read info from any secondary header packets, if there are any */
 280             if( p_stream->secondary_header_packets > 0 )
 281             {
 282                 if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
 283                         oggpacket.bytes >= 7 &&
 284                         ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
 285                 {
 286                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
 287                     p_stream->secondary_header_packets = 0;
 288                 }
 289                 else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
 290                         oggpacket.bytes >= 7 &&
 291                         ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
 292                 {
 293                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
 294                     p_stream->secondary_header_packets = 0;
 295                 }
 296                 else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
 297                 {
 298                     p_stream->secondary_header_packets = 0;
 299                 }
 300             }
 301
 302             if( p_stream->b_reinit )
 303             {
 304                 /* If synchro is re-initialized we need to drop all the packets
 305                  * until we find a new dated one. */
 306                 Ogg_UpdatePCR( p_stream, &oggpacket );
 307
 308                 if( p_stream->i_pcr >= 0 )
 309                 {
 310                     p_stream->b_reinit = 0;
 311                 }
 312                 else
 313                 {
 314                     p_stream->i_interpolated_pcr = -1;
 315                     continue;
 316                 }
 317
 318                 /* An Ogg/vorbis packet contains an end date granulepos */
 319                 if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
 320                     p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
 321                     p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
 322                 {
 323                     if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
 324                     {
 325                         Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
 326                     }
 327                     else
 328                     {
 329                         es_out_Control( p_demux->out, ES_OUT_SET_PCR,
 330                                         p_stream->i_pcr );
 331                     }
 332                     continue;
 333                 }
 334             }
 335
 336             Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
 337         }
 338         break;
 339     }
 340
 341     i_stream = 0; p_sys->i_pcr = -1;
 342     for( ; i_stream < p_sys->i_streams; i_stream++ )
 343     {
 344         logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
 345
 346         if( p_stream->fmt.i_cat == SPU_ES )
 347             continue;
 348         if( p_stream->i_interpolated_pcr < 0 )
 349             continue;
 350
 351         if( p_sys->i_pcr < 0 || p_stream->i_interpolated_pcr < p_sys->i_pcr )
 352             p_sys->i_pcr = p_stream->i_interpolated_pcr;
 353     }
 354
 355     if( p_sys->i_pcr >= 0 )
 356     {
 357         es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
 358     }
 359
 360
 361     return 1;
 362 }
 363
 364 /*****************************************************************************
 365  * Control:
 366  *****************************************************************************/
 367 static int Control( demux_t *p_demux, int i_query, va_list args )
 368 {
 369     demux_sys_t *p_sys  = p_demux->p_sys;
 370     int64_t *pi64;
 371     int i;
 372
 373     switch( i_query )
 374     {
 375         case DEMUX_GET_TIME:
 376             pi64 = (int64_t*)va_arg( args, int64_t * );
 377             *pi64 = p_sys->i_pcr;
 378             return VLC_SUCCESS;
 379
 380         case DEMUX_SET_TIME:
 381             return VLC_EGENERIC;
 382
 383         case DEMUX_SET_POSITION:
 384             for( i = 0; i < p_sys->i_streams; i++ )
 385             {
 386                 logical_stream_t *p_stream = p_sys->pp_stream[i];
 387
 388                 /* we'll trash all the data until we find the next pcr */
 389                 p_stream->b_reinit = 1;
 390                 p_stream->i_pcr = -1;
 391                 p_stream->i_interpolated_pcr = -1;
 392                 ogg_stream_reset( &p_stream->os );
 393             }
 394             ogg_sync_reset( &p_sys->oy );
 395
 396         default:
 397             return demux2_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
 398                                            1, i_query, args );
 399     }
 400 }
 401
 402 /****************************************************************************
 403  * Ogg_ReadPage: Read a full Ogg page from the physical bitstream.
 404  ****************************************************************************
 405  * Returns VLC_SUCCESS if a page has been read. An error might happen if we
 406  * are at the end of stream.
 407  ****************************************************************************/
 408 static int Ogg_ReadPage( demux_t *p_demux, ogg_page *p_oggpage )
 409 {
 410     demux_sys_t *p_ogg = p_demux->p_sys  ;
 411     int i_read = 0;
 412     byte_t *p_buffer;
 413
 414     while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
 415     {
 416         p_buffer = ogg_sync_buffer( &p_ogg->oy, OGG_BLOCK_SIZE );
 417
 418         i_read = stream_Read( p_demux->s, p_buffer, OGG_BLOCK_SIZE );
 419         if( i_read <= 0 )
 420             return VLC_EGENERIC;
 421
 422         ogg_sync_wrote( &p_ogg->oy, i_read );
 423     }
 424
 425     return VLC_SUCCESS;
 426 }
 427
 428 /****************************************************************************
 429  * Ogg_UpdatePCR: update the PCR (90kHz program clock reference) for the
 430  *                current stream.
 431  ****************************************************************************/
 432 static void Ogg_UpdatePCR( logical_stream_t *p_stream,
 433                            ogg_packet *p_oggpacket )
 434 {
 435     /* Convert the granulepos into a pcr */
 436     if( p_oggpacket->granulepos >= 0 )
 437     {
 438         if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) )
 439         {
 440             p_stream->i_pcr = p_oggpacket->granulepos * I64C(1000000)
 441                               / p_stream->f_rate;
 442         }
 443         else
 444         {
 445             ogg_int64_t iframe = p_oggpacket->granulepos >>
 446               p_stream->i_theora_keyframe_granule_shift;
 447             ogg_int64_t pframe = p_oggpacket->granulepos -
 448               ( iframe << p_stream->i_theora_keyframe_granule_shift );
 449
 450             p_stream->i_pcr = ( iframe + pframe ) * I64C(1000000)
 451                               / p_stream->f_rate;
 452         }
 453
 454         p_stream->i_interpolated_pcr = p_stream->i_pcr;
 455     }
 456     else
 457     {
 458         p_stream->i_pcr = -1;
 459
 460         /* no granulepos available, try to interpolate the pcr.
 461          * If we can't then don't touch the old value. */
 462         if( p_stream->fmt.i_cat == VIDEO_ES )
 463             /* 1 frame per packet */
 464             p_stream->i_interpolated_pcr += (I64C(1000000) / p_stream->f_rate);
 465         else if( p_stream->fmt.i_bitrate )
 466             p_stream->i_interpolated_pcr +=
 467                 ( p_oggpacket->bytes * I64C(1000000) /
 468                   p_stream->fmt.i_bitrate / 8 );
 469     }
 470 }
 471
 472 /****************************************************************************
 473  * Ogg_DecodePacket: Decode an Ogg packet.
 474  ****************************************************************************/
 475 static void Ogg_DecodePacket( demux_t *p_demux,
 476                               logical_stream_t *p_stream,
 477                               ogg_packet *p_oggpacket )
 478 {
 479     block_t *p_block;
 480     vlc_bool_t b_selected;
 481     int i_header_len = 0;
 482     mtime_t i_pts = -1, i_interpolated_pts;
 483
 484     /* Sanity check */
 485     if( !p_oggpacket->bytes )
 486     {
 487         msg_Dbg( p_demux, "discarding 0 sized packet" );
 488         return;
 489     }
 490
 491     if( p_oggpacket->bytes >= 7 &&
 492         ! strncmp ( &p_oggpacket->packet[0], "Annodex", 7 ) )
 493     {
 494         /* it's an Annodex packet -- skip it (do nothing) */
 495         return;
 496     }
 497     else if( p_oggpacket->bytes >= 7 &&
 498         ! strncmp ( &p_oggpacket->packet[0], "AnxData", 7 ) )
 499     {
 500         /* it's an AnxData packet -- skip it (do nothing) */
 501         return;
 502     }
 503
 504     /* Check the ES is selected */
 505     es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
 506                     p_stream->p_es, &b_selected );
 507
 508     if( p_stream->b_force_backup )
 509     {
 510         uint8_t *p_extra;
 511         vlc_bool_t b_store_size = VLC_TRUE;
 512
 513         p_stream->i_packets_backup++;
 514         switch( p_stream->fmt.i_codec )
 515         {
 516         case VLC_FOURCC( 'v','o','r','b' ):
 517         case VLC_FOURCC( 's','p','x',' ' ):
 518         case VLC_FOURCC( 't','h','e','o' ):
 519           if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
 520           break;
 521
 522         case VLC_FOURCC( 'f','l','a','c' ):
 523           if( p_stream->i_packets_backup == 2 )
 524           {
 525               Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
 526               p_stream->b_force_backup = 0;
 527           }
 528           b_store_size = VLC_FALSE;
 529           break;
 530
 531         default:
 532           p_stream->b_force_backup = 0;
 533           break;
 534         }
 535
 536         /* Backup the ogg packet (likely an header packet) */
 537         p_stream->p_headers =
 538             realloc( p_stream->p_headers, p_stream->i_headers +
 539                      p_oggpacket->bytes + (b_store_size ? 2 : 0) );
 540         p_extra = p_stream->p_headers + p_stream->i_headers;
 541         if( b_store_size )
 542         {
 543             *(p_extra++) = p_oggpacket->bytes >> 8;
 544             *(p_extra++) = p_oggpacket->bytes & 0xFF;
 545         }
 546         memcpy( p_extra, p_oggpacket->packet, p_oggpacket->bytes );
 547         p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0);
 548
 549         if( !p_stream->b_force_backup )
 550         {
 551             /* Last header received, commit changes */
 552             p_stream->fmt.i_extra = p_stream->i_headers;
 553             p_stream->fmt.p_extra =
 554                 realloc( p_stream->fmt.p_extra, p_stream->i_headers );
 555             memcpy( p_stream->fmt.p_extra, p_stream->p_headers,
 556                     p_stream->i_headers );
 557             es_out_Control( p_demux->out, ES_OUT_SET_FMT,
 558                             p_stream->p_es, &p_stream->fmt );
 559         }
 560
 561         b_selected = VLC_FALSE; /* Discard the header packet */
 562     }
 563
 564     /* Convert the pcr into a pts */
 565     if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
 566         p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
 567         p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
 568     {
 569         if( p_stream->i_pcr >= 0 )
 570         {
 571             /* This is for streams where the granulepos of the header packets
 572              * doesn't match these of the data packets (eg. ogg web radios). */
 573             if( p_stream->i_previous_pcr == 0 &&
 574                 p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
 575             {
 576                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 577
 578                 /* Call the pace control */
 579                 es_out_Control( p_demux->out, ES_OUT_SET_PCR,
 580                                 p_stream->i_pcr );
 581             }
 582
 583             p_stream->i_previous_pcr = p_stream->i_pcr;
 584
 585             /* The granulepos is the end date of the sample */
 586             i_pts =  p_stream->i_pcr;
 587         }
 588     }
 589
 590     /* Convert the granulepos into the next pcr */
 591     i_interpolated_pts = p_stream->i_interpolated_pcr;
 592     Ogg_UpdatePCR( p_stream, p_oggpacket );
 593
 594     if( p_stream->i_pcr >= 0 )
 595     {
 596         /* This is for streams where the granulepos of the header packets
 597          * doesn't match these of the data packets (eg. ogg web radios). */
 598         if( p_stream->i_previous_pcr == 0 &&
 599             p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
 600         {
 601             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 602
 603             /* Call the pace control */
 604             es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_stream->i_pcr );
 605         }
 606     }
 607
 608     if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
 609         p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
 610         p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
 611         p_stream->i_pcr >= 0 )
 612     {
 613         p_stream->i_previous_pcr = p_stream->i_pcr;
 614
 615         /* The granulepos is the start date of the sample */
 616         i_pts = p_stream->i_pcr;
 617     }
 618
 619     if( !b_selected )
 620     {
 621         /* This stream isn't currently selected so we don't need to decode it,
 622          * but we did need to store its pcr as it might be selected later on */
 623         return;
 624     }
 625
 626     if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
 627
 628     /* Normalize PTS */
 629     if( i_pts == 0 ) i_pts = 1;
 630     else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = 1;
 631     else if( i_pts == -1 ) i_pts = 0;
 632
 633     if( p_stream->fmt.i_cat == AUDIO_ES )
 634         p_block->i_dts = p_block->i_pts = i_pts;
 635     else if( p_stream->fmt.i_cat == SPU_ES )
 636     {
 637         p_block->i_dts = p_block->i_pts = i_pts;
 638         p_block->i_length = 0;
 639     }
 640     else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) )
 641         p_block->i_dts = p_block->i_pts = i_pts;
 642     else
 643     {
 644         p_block->i_dts = i_pts;
 645         p_block->i_pts = 0;
 646     }
 647
 648     if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
 649         p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
 650         p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
 651         p_stream->fmt.i_codec != VLC_FOURCC( 't','a','r','k' ) &&
 652         p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) &&
 653         p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) )
 654     {
 655         /* We remove the header from the packet */
 656         i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
 657         i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
 658
 659         if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ))
 660         {
 661             /* But with subtitles we need to retrieve the duration first */
 662             int i, lenbytes = 0;
 663
 664             if( i_header_len > 0 && p_oggpacket->bytes >= i_header_len + 1 )
 665             {
 666                 for( i = 0, lenbytes = 0; i < i_header_len; i++ )
 667                 {
 668                     lenbytes = lenbytes << 8;
 669                     lenbytes += *(p_oggpacket->packet + i_header_len - i);
 670                 }
 671             }
 672             if( p_oggpacket->bytes - 1 - i_header_len > 2 ||
 673                 ( p_oggpacket->packet[i_header_len + 1] != ' ' &&
 674                   p_oggpacket->packet[i_header_len + 1] != 0 &&
 675                   p_oggpacket->packet[i_header_len + 1] != '\n' &&
 676                   p_oggpacket->packet[i_header_len + 1] != '\r' ) )
 677             {
 678                 p_block->i_length = (mtime_t)lenbytes * 1000;
 679             }
 680         }
 681
 682         i_header_len++;
 683         p_block->i_buffer -= i_header_len;
 684     }
 685
 686     if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) )
 687     {
 688         /* FIXME: the biggest hack I've ever done */
 689         msg_Warn( p_demux, "tarkin pts: "I64Fd", granule: "I64Fd,
 690                   p_block->i_pts, p_block->i_dts );
 691         msleep(10000);
 692     }
 693
 694     memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len,
 695             p_oggpacket->bytes - i_header_len );
 696
 697     es_out_Send( p_demux->out, p_stream->p_es, p_block );
 698 }
 699
 700 /****************************************************************************
 701  * Ogg_FindLogicalStreams: Find the logical streams embedded in the physical
 702  *                         stream and fill p_ogg.
 703  *****************************************************************************
 704  * The initial page of a logical stream is marked as a 'bos' page.
 705  * Furthermore, the Ogg specification mandates that grouped bitstreams begin
 706  * together and all of the initial pages must appear before any data pages.
 707  *
 708  * On success this function returns VLC_SUCCESS.
 709  ****************************************************************************/
 710 static int Ogg_FindLogicalStreams( demux_t *p_demux )
 711 {
 712     demux_sys_t *p_ogg = p_demux->p_sys  ;
 713     ogg_packet oggpacket;
 714     ogg_page oggpage;
 715     int i_stream;
 716
 717 #define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1]
 718
 719     while( Ogg_ReadPage( p_demux, &oggpage ) == VLC_SUCCESS )
 720     {
 721         if( ogg_page_bos( &oggpage ) )
 722         {
 723
 724             /* All is wonderful in our fine fine little world.
 725              * We found the beginning of our first logical stream. */
 726             while( ogg_page_bos( &oggpage ) )
 727             {
 728                 p_ogg->i_streams++;
 729                 p_ogg->pp_stream =
 730                     realloc( p_ogg->pp_stream, p_ogg->i_streams *
 731                              sizeof(logical_stream_t *) );
 732
 733                 p_stream = malloc( sizeof(logical_stream_t) );
 734                 memset( p_stream, 0, sizeof(logical_stream_t) );
 735                 p_stream->p_headers = 0;
 736                 p_stream->secondary_header_packets = 0;
 737
 738                 es_format_Init( &p_stream->fmt, 0, 0 );
 739
 740                 /* Setup the logical stream */
 741                 p_stream->i_serial_no = ogg_page_serialno( &oggpage );
 742                 ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
 743
 744                 /* Extract the initial header from the first page and verify
 745                  * the codec type of tis Ogg bitstream */
 746                 if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
 747                 {
 748                     /* error. stream version mismatch perhaps */
 749                     msg_Err( p_demux, "error reading first page of "
 750                              "Ogg bitstream data" );
 751                     return VLC_EGENERIC;
 752                 }
 753
 754                 /* FIXME: check return value */
 755                 ogg_stream_packetpeek( &p_stream->os, &oggpacket );
 756
 757                 /* Check for Vorbis header */
 758                 if( oggpacket.bytes >= 7 &&
 759                     ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
 760                 {
 761                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
 762                     msg_Dbg( p_demux, "found vorbis header" );
 763                 }
 764                 /* Check for Speex header */
 765                 else if( oggpacket.bytes >= 7 &&
 766                     ! strncmp( &oggpacket.packet[0], "Speex", 5 ) )
 767                 {
 768                     Ogg_ReadSpeexHeader( p_stream, &oggpacket );
 769                     msg_Dbg( p_demux, "found speex header, channels: %i, "
 770                              "rate: %i,  bitrate: %i",
 771                              p_stream->fmt.audio.i_channels,
 772                              (int)p_stream->f_rate, p_stream->fmt.i_bitrate );
 773                 }
 774                 /* Check for Flac header */
 775                 else if( oggpacket.bytes >= 4 &&
 776                     ! strncmp( &oggpacket.packet[0], "fLaC", 4 ) )
 777                 {
 778                     msg_Dbg( p_demux, "found FLAC header" );
 779
 780                     /* Grrrr!!!! Did they really have to put all the
 781                      * important info in the second header packet!!!
 782                      * (STREAMINFO metadata is in the following packet) */
 783                     p_stream->b_force_backup = 1;
 784
 785                     p_stream->fmt.i_cat = AUDIO_ES;
 786                     p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
 787                 }
 788                 /* Check for Theora header */
 789                 else if( oggpacket.bytes >= 7 &&
 790                          ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
 791                 {
 792                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
 793
 794                     msg_Dbg( p_demux,
 795                              "found theora header, bitrate: %i, rate: %f",
 796                              p_stream->fmt.i_bitrate, p_stream->f_rate );
 797                 }
 798                 /* Check for Tarkin header */
 799                 else if( oggpacket.bytes >= 7 &&
 800                          ! strncmp( &oggpacket.packet[1], "tarkin", 6 ) )
 801                 {
 802                     oggpack_buffer opb;
 803
 804                     msg_Dbg( p_demux, "found tarkin header" );
 805                     p_stream->fmt.i_cat = VIDEO_ES;
 806                     p_stream->fmt.i_codec = VLC_FOURCC( 't','a','r','k' );
 807
 808                     /* Cheat and get additionnal info ;) */
 809                     oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
 810                     oggpack_adv( &opb, 88 );
 811                     oggpack_adv( &opb, 104 );
 812                     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
 813                     p_stream->f_rate = 2; /* FIXME */
 814                     msg_Dbg( p_demux,
 815                              "found tarkin header, bitrate: %i, rate: %f",
 816                              p_stream->fmt.i_bitrate, p_stream->f_rate );
 817                 }
 818                 /* Check for Annodex header */
 819                 else if( oggpacket.bytes >= 7 &&
 820                          ! strncmp( &oggpacket.packet[0], "Annodex", 7 ) )
 821                 {
 822                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
 823                                            &oggpacket );
 824                     /* kill annodex track */
 825                     free( p_stream );
 826                     p_ogg->i_streams--;
 827                 }
 828                 /* Check for Annodex header */
 829                 else if( oggpacket.bytes >= 7 &&
 830                          ! strncmp( &oggpacket.packet[0], "AnxData", 7 ) )
 831                 {
 832                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
 833                                            &oggpacket );
 834                 }
 835                 else if( oggpacket.bytes >= 142 &&
 836                          !strncmp( &oggpacket.packet[1],
 837                                    "Direct Show Samples embedded in Ogg", 35 ))
 838                 {
 839                     /* Old header type */
 840
 841                     /* Check for video header (old format) */
 842                     if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 &&
 843                         oggpacket.bytes >= 184 )
 844                     {
 845                         p_stream->fmt.i_cat = VIDEO_ES;
 846                         p_stream->fmt.i_codec =
 847                             VLC_FOURCC( oggpacket.packet[68],
 848                                         oggpacket.packet[69],
 849                                         oggpacket.packet[70],
 850                                         oggpacket.packet[71] );
 851                         msg_Dbg( p_demux, "found video header of type: %.4s",
 852                                  (char *)&p_stream->fmt.i_codec );
 853
 854                         p_stream->f_rate = 10000000.0 /
 855                             GetQWLE((oggpacket.packet+164));
 856                         p_stream->fmt.video.i_bits_per_pixel =
 857                             GetWLE((oggpacket.packet+182));
 858                         if( !p_stream->fmt.video.i_bits_per_pixel )
 859                             /* hack, FIXME */
 860                             p_stream->fmt.video.i_bits_per_pixel = 24;
 861                         p_stream->fmt.video.i_width =
 862                             GetDWLE((oggpacket.packet+176));
 863                         p_stream->fmt.video.i_height =
 864                             GetDWLE((oggpacket.packet+180));
 865
 866                         msg_Dbg( p_demux,
 867                                  "fps: %f, width:%i; height:%i, bitcount:%i",
 868                                  p_stream->f_rate,
 869                                  p_stream->fmt.video.i_width,
 870                                  p_stream->fmt.video.i_height,
 871                                  p_stream->fmt.video.i_bits_per_pixel);
 872
 873                     }
 874                     /* Check for audio header (old format) */
 875                     else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
 876                     {
 877                         unsigned int i_extra_size;
 878                         unsigned int i_format_tag;
 879
 880                         p_stream->fmt.i_cat = AUDIO_ES;
 881
 882                         i_extra_size = GetWLE((oggpacket.packet+140));
 883                         if( i_extra_size )
 884                         {
 885                             p_stream->fmt.i_extra = i_extra_size;
 886                             p_stream->fmt.p_extra = malloc( i_extra_size );
 887                             memcpy( p_stream->fmt.p_extra,
 888                                     oggpacket.packet + 142, i_extra_size );
 889                         }
 890
 891                         i_format_tag = GetWLE((oggpacket.packet+124));
 892                         p_stream->fmt.audio.i_channels =
 893                             GetWLE((oggpacket.packet+126));
 894                         p_stream->f_rate = p_stream->fmt.audio.i_rate =
 895                             GetDWLE((oggpacket.packet+128));
 896                         p_stream->fmt.i_bitrate =
 897                             GetDWLE((oggpacket.packet+132)) * 8;
 898                         p_stream->fmt.audio.i_blockalign =
 899                             GetWLE((oggpacket.packet+136));
 900                         p_stream->fmt.audio.i_bitspersample =
 901                             GetWLE((oggpacket.packet+138));
 902
 903                         wf_tag_to_fourcc( i_format_tag,
 904                                           &p_stream->fmt.i_codec, 0 );
 905
 906                         if( p_stream->fmt.i_codec ==
 907                             VLC_FOURCC('u','n','d','f') )
 908                         {
 909                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
 910                                 ( i_format_tag >> 8 ) & 0xff,
 911                                 i_format_tag & 0xff );
 912                         }
 913
 914                         msg_Dbg( p_demux, "found audio header of type: %.4s",
 915                                  (char *)&p_stream->fmt.i_codec );
 916                         msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
 917                                  "%dbits/sample %dkb/s",
 918                                  i_format_tag,
 919                                  p_stream->fmt.audio.i_channels,
 920                                  p_stream->fmt.audio.i_rate,
 921                                  p_stream->fmt.audio.i_bitspersample,
 922                                  p_stream->fmt.i_bitrate / 1024 );
 923
 924                     }
 925                     else
 926                     {
 927                         msg_Dbg( p_demux, "stream %d has an old header "
 928                             "but is of an unknown type", p_ogg->i_streams-1 );
 929                         free( p_stream );
 930                         p_ogg->i_streams--;
 931                     }
 932                 }
 933                 else if( (*oggpacket.packet & PACKET_TYPE_BITS )
 934                          == PACKET_TYPE_HEADER &&
 935                          oggpacket.bytes >= (int)sizeof(stream_header)+1 )
 936                 {
 937                     stream_header *st = (stream_header *)(oggpacket.packet+1);
 938
 939                     /* Check for video header (new format) */
 940                     if( !strncmp( st->streamtype, "video", 5 ) )
 941                     {
 942                         p_stream->fmt.i_cat = VIDEO_ES;
 943
 944                         /* We need to get rid of the header packet */
 945                         ogg_stream_packetout( &p_stream->os, &oggpacket );
 946
 947                         p_stream->fmt.i_codec =
 948                             VLC_FOURCC( st->subtype[0], st->subtype[1],
 949                                         st->subtype[2], st->subtype[3] );
 950                         msg_Dbg( p_demux, "found video header of type: %.4s",
 951                                  (char *)&p_stream->fmt.i_codec );
 952
 953                         p_stream->f_rate = 10000000.0 /
 954                             GetQWLE(&st->time_unit);
 955                         p_stream->fmt.video.i_bits_per_pixel =
 956                             GetWLE(&st->bits_per_sample);
 957                         p_stream->fmt.video.i_width =
 958                             GetDWLE(&st->sh.video.width);
 959                         p_stream->fmt.video.i_height =
 960                             GetDWLE(&st->sh.video.height);
 961
 962                         msg_Dbg( p_demux,
 963                                  "fps: %f, width:%i; height:%i, bitcount:%i",
 964                                  p_stream->f_rate,
 965                                  p_stream->fmt.video.i_width,
 966                                  p_stream->fmt.video.i_height,
 967                                  p_stream->fmt.video.i_bits_per_pixel );
 968                     }
 969                     /* Check for audio header (new format) */
 970                     else if( !strncmp( st->streamtype, "audio", 5 ) )
 971                     {
 972                         char p_buffer[5];
 973                         int i_format_tag;
 974
 975                         p_stream->fmt.i_cat = AUDIO_ES;
 976
 977                         /* We need to get rid of the header packet */
 978                         ogg_stream_packetout( &p_stream->os, &oggpacket );
 979
 980                         p_stream->fmt.i_extra = GetQWLE(&st->size) -
 981                             sizeof(stream_header);
 982                         if( p_stream->fmt.i_extra )
 983                         {
 984                             p_stream->fmt.p_extra =
 985                                 malloc( p_stream->fmt.i_extra );
 986                             memcpy( p_stream->fmt.p_extra, st + 1,
 987                                     p_stream->fmt.i_extra );
 988                         }
 989
 990                         memcpy( p_buffer, st->subtype, 4 );
 991                         p_buffer[4] = '\0';
 992                         i_format_tag = strtol(p_buffer,NULL,16);
 993                         p_stream->fmt.audio.i_channels =
 994                             GetWLE(&st->sh.audio.channels);
 995                         p_stream->f_rate = p_stream->fmt.audio.i_rate =
 996                             GetQWLE(&st->samples_per_unit);
 997                         p_stream->fmt.i_bitrate =
 998                             GetDWLE(&st->sh.audio.avgbytespersec) * 8;
 999                         p_stream->fmt.audio.i_blockalign =
1000                             GetWLE(&st->sh.audio.blockalign);
1001                         p_stream->fmt.audio.i_bitspersample =
1002                             GetWLE(&st->bits_per_sample);
1003
1004                         wf_tag_to_fourcc( i_format_tag,
1005                                           &p_stream->fmt.i_codec, 0 );
1006
1007                         if( p_stream->fmt.i_codec ==
1008                             VLC_FOURCC('u','n','d','f') )
1009                         {
1010                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
1011                                 ( i_format_tag >> 8 ) & 0xff,
1012                                 i_format_tag & 0xff );
1013                         }
1014
1015                         msg_Dbg( p_demux, "found audio header of type: %.4s",
1016                                  (char *)&p_stream->fmt.i_codec );
1017                         msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
1018                                  "%dbits/sample %dkb/s",
1019                                  i_format_tag,
1020                                  p_stream->fmt.audio.i_channels,
1021                                  p_stream->fmt.audio.i_rate,
1022                                  p_stream->fmt.audio.i_bitspersample,
1023                                  p_stream->fmt.i_bitrate / 1024 );
1024                     }
1025                     /* Check for text (subtitles) header */
1026                     else if( !strncmp(st->streamtype, "text", 4) )
1027                     {
1028                         /* We need to get rid of the header packet */
1029                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1030
1031                         msg_Dbg( p_demux, "found text subtitles header" );
1032                         p_stream->fmt.i_cat = SPU_ES;
1033                         p_stream->fmt.i_codec = VLC_FOURCC('s','u','b','t');
1034                         p_stream->f_rate = 1000; /* granulepos is in milisec */
1035                     }
1036                     else
1037                     {
1038                         msg_Dbg( p_demux, "stream %d has a header marker "
1039                             "but is of an unknown type", p_ogg->i_streams-1 );
1040                         free( p_stream );
1041                         p_ogg->i_streams--;
1042                     }
1043                 }
1044                 else
1045                 {
1046                     msg_Dbg( p_demux, "stream %d is of unknown type",
1047                              p_ogg->i_streams-1 );
1048                     free( p_stream );
1049                     p_ogg->i_streams--;
1050                 }
1051
1052                 if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
1053                     return VLC_EGENERIC;
1054             }
1055
1056             /* This is the first data page, which means we are now finished
1057              * with the initial pages. We just need to store it in the relevant
1058              * bitstream. */
1059             for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1060             {
1061                 if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
1062                                        &oggpage ) == 0 )
1063                 {
1064                     break;
1065                 }
1066             }
1067
1068             return VLC_SUCCESS;
1069         }
1070     }
1071 #undef p_stream
1072
1073     return VLC_EGENERIC;
1074 }
1075
1076 /****************************************************************************
1077  * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
1078  *                        Elementary streams.
1079  ****************************************************************************/
1080 static int Ogg_BeginningOfStream( demux_t *p_demux )
1081 {
1082     demux_sys_t *p_ogg = p_demux->p_sys  ;
1083     int i_stream;
1084
1085     /* Find the logical streams embedded in the physical stream and
1086      * initialize our p_ogg structure. */
1087     if( Ogg_FindLogicalStreams( p_demux ) != VLC_SUCCESS )
1088     {
1089         msg_Warn( p_demux, "couldn't find any ogg logical stream" );
1090         return VLC_EGENERIC;
1091     }
1092
1093     p_ogg->i_bitrate = 0;
1094
1095     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1096     {
1097 #define p_stream p_ogg->pp_stream[i_stream]
1098         p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt );
1099
1100         if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
1101         {
1102             /* Set the CMML stream active */
1103             es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es );
1104         }
1105
1106         p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
1107
1108         p_stream->i_pcr = p_stream->i_previous_pcr =
1109             p_stream->i_interpolated_pcr = -1;
1110         p_stream->b_reinit = 0;
1111 #undef p_stream
1112     }
1113
1114     return VLC_SUCCESS;
1115 }
1116
1117 /****************************************************************************
1118  * Ogg_EndOfStream: clean up the ES when an End of Stream is detected.
1119  ****************************************************************************/
1120 static void Ogg_EndOfStream( demux_t *p_demux )
1121 {
1122     demux_sys_t *p_ogg = p_demux->p_sys  ;
1123     int i_stream;
1124
1125 #define p_stream p_ogg->pp_stream[i_stream]
1126     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1127     {
1128         if( p_stream->p_es )
1129             es_out_Del( p_demux->out, p_stream->p_es );
1130
1131         p_ogg->i_bitrate -= p_stream->fmt.i_bitrate;
1132
1133         ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os );
1134         if( p_ogg->pp_stream[i_stream]->p_headers)
1135             free( p_ogg->pp_stream[i_stream]->p_headers );
1136
1137         es_format_Clean( &p_stream->fmt );
1138
1139         free( p_ogg->pp_stream[i_stream] );
1140     }
1141 #undef p_stream
1142
1143     /* Reinit p_ogg */
1144     if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
1145     p_ogg->pp_stream = NULL;
1146     p_ogg->i_streams = 0;
1147 }
1148
1149 static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream,
1150                                   ogg_packet *p_oggpacket )
1151 {
1152     bs_t bitstream;
1153     int i_fps_numerator;
1154     int i_fps_denominator;
1155     int i_keyframe_frequency_force;
1156
1157     p_stream->fmt.i_cat = VIDEO_ES;
1158     p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' );
1159
1160     /* Signal that we want to keep a backup of the theora
1161      * stream headers. They will be used when switching between
1162      * audio streams. */
1163     p_stream->b_force_backup = 1;
1164
1165     /* Cheat and get additionnal info ;) */
1166     bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes );
1167     bs_skip( &bitstream, 56 );
1168     bs_read( &bitstream, 8 ); /* major version num */
1169     bs_read( &bitstream, 8 ); /* minor version num */
1170     bs_read( &bitstream, 8 ); /* subminor version num */
1171     bs_read( &bitstream, 16 ) /*<< 4*/; /* width */
1172     bs_read( &bitstream, 16 ) /*<< 4*/; /* height */
1173     bs_read( &bitstream, 24 ); /* frame width */
1174     bs_read( &bitstream, 24 ); /* frame height */
1175     bs_read( &bitstream, 8 ); /* x offset */
1176     bs_read( &bitstream, 8 ); /* y offset */
1177
1178     i_fps_numerator = bs_read( &bitstream, 32 );
1179     i_fps_denominator = bs_read( &bitstream, 32 );
1180     bs_read( &bitstream, 24 ); /* aspect_numerator */
1181     bs_read( &bitstream, 24 ); /* aspect_denominator */
1182
1183     bs_read( &bitstream, 8 ); /* colorspace */
1184     p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 );
1185     bs_read( &bitstream, 6 ); /* quality */
1186
1187     i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 );
1188
1189     /* granule_shift = i_log( frequency_force -1 ) */
1190     p_stream->i_theora_keyframe_granule_shift = 0;
1191     i_keyframe_frequency_force--;
1192     while( i_keyframe_frequency_force )
1193     {
1194         p_stream->i_theora_keyframe_granule_shift++;
1195         i_keyframe_frequency_force >>= 1;
1196     }
1197
1198     p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator;
1199 }
1200
1201 static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream,
1202                                   ogg_packet *p_oggpacket )
1203 {
1204     oggpack_buffer opb;
1205
1206     p_stream->fmt.i_cat = AUDIO_ES;
1207     p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
1208
1209     /* Signal that we want to keep a backup of the vorbis
1210      * stream headers. They will be used when switching between
1211      * audio streams. */
1212     p_stream->b_force_backup = 1;
1213
1214     /* Cheat and get additionnal info ;) */
1215     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1216     oggpack_adv( &opb, 88 );
1217     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
1218     p_stream->f_rate = p_stream->fmt.audio.i_rate =
1219         oggpack_read( &opb, 32 );
1220     oggpack_adv( &opb, 32 );
1221     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1222 }
1223
1224 static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream,
1225                                  ogg_packet *p_oggpacket )
1226 {
1227     oggpack_buffer opb;
1228
1229     p_stream->fmt.i_cat = AUDIO_ES;
1230     p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' );
1231
1232     /* Signal that we want to keep a backup of the speex
1233      * stream headers. They will be used when switching between
1234      * audio streams. */
1235     p_stream->b_force_backup = 1;
1236
1237     /* Cheat and get additionnal info ;) */
1238     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1239     oggpack_adv( &opb, 224 );
1240     oggpack_adv( &opb, 32 ); /* speex_version_id */
1241     oggpack_adv( &opb, 32 ); /* header_size */
1242     p_stream->f_rate = p_stream->fmt.audio.i_rate = oggpack_read( &opb, 32 );
1243     oggpack_adv( &opb, 32 ); /* mode */
1244     oggpack_adv( &opb, 32 ); /* mode_bitstream_version */
1245     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 );
1246     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1247 }
1248
1249 static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream,
1250                                 ogg_packet *p_oggpacket )
1251 {
1252     /* Parse the STREAMINFO metadata */
1253     bs_t s;
1254
1255     bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes );
1256     bs_read( &s, 1 );
1257     if( bs_read( &s, 7 ) == 0 )
1258     {
1259         if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ )
1260         {
1261             bs_skip( &s, 80 );
1262             p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 );
1263             p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1;
1264
1265             msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
1266                      p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
1267         }
1268         else msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
1269
1270         /* Fake this as the last metadata block */
1271         *((uint8_t*)p_oggpacket->packet) |= 0x80;
1272     }
1273     else
1274     {
1275         /* This ain't a STREAMINFO metadata */
1276         msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" );
1277     }
1278 }
1279
1280 static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
1281                                    logical_stream_t *p_stream,
1282                                    ogg_packet *p_oggpacket )
1283 {
1284     if( ! strncmp( &p_oggpacket->packet[0], "Annodex", 7 ) )
1285     {
1286         oggpack_buffer opb;
1287
1288         uint16_t major_version;
1289         uint16_t minor_version;
1290         uint64_t timebase_numerator;
1291         uint64_t timebase_denominator;
1292
1293         Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
1294
1295         oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1296         oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
1297         major_version = oggpack_read( &opb, 2*8 ); /* major version */
1298         minor_version = oggpack_read( &opb, 2*8 ); /* minor version */
1299         timebase_numerator = GetQWLE( &p_oggpacket->packet[16] );
1300         timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
1301     }
1302     else if( ! strncmp( &p_oggpacket->packet[0], "AnxData", 7 ) )
1303     {
1304         uint64_t granule_rate_numerator;
1305         uint64_t granule_rate_denominator;
1306         char content_type_string[1024];
1307
1308         /* Read in Annodex header fields */
1309
1310         granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] );
1311         granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] );
1312         p_stream->secondary_header_packets =
1313             GetDWLE( &p_oggpacket->packet[24] );
1314
1315         /* we are guaranteed that the first header field will be
1316          * the content-type (by the Annodex standard) */
1317         if( !strncasecmp( &p_oggpacket->packet[28], "Content-Type: ", 14 ) )
1318         {
1319             sscanf( &p_oggpacket->packet[42], "%1024s\r\n",
1320                     content_type_string );
1321         }
1322
1323         msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''",
1324                  granule_rate_numerator, granule_rate_denominator,
1325                  p_stream->secondary_header_packets, content_type_string );
1326
1327         p_stream->f_rate = (float) granule_rate_numerator /
1328             (float) granule_rate_denominator;
1329
1330         /* What type of file do we have?
1331          * strcmp is safe to use here because we've extracted
1332          * content_type_string from the stream manually */
1333         if( !strncmp(content_type_string, "audio/x-wav", 11) )
1334         {
1335             /* n.b. WAVs are unsupported right now */
1336             p_stream->fmt.i_cat = UNKNOWN_ES;
1337         }
1338         else if( !strncmp(content_type_string, "audio/x-vorbis", 14) )
1339         {
1340             p_stream->fmt.i_cat = AUDIO_ES;
1341             p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
1342
1343             p_stream->b_force_backup = 1;
1344         }
1345         else if( !strncmp(content_type_string, "audio/x-speex", 14) )
1346         {
1347             p_stream->fmt.i_cat = AUDIO_ES;
1348             p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' );
1349
1350             p_stream->b_force_backup = 1;
1351         }
1352         else if( !strncmp(content_type_string, "video/x-theora", 14) )
1353         {
1354             p_stream->fmt.i_cat = VIDEO_ES;
1355             p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' );
1356
1357             p_stream->b_force_backup = 1;
1358         }
1359         else if( !strncmp(content_type_string, "video/x-xvid", 14) )
1360         {
1361             p_stream->fmt.i_cat = VIDEO_ES;
1362             p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' );
1363
1364             p_stream->b_force_backup = 1;
1365         }
1366         else if( !strncmp(content_type_string, "video/mpeg", 14) )
1367         {
1368             /* n.b. MPEG streams are unsupported right now */
1369             p_stream->fmt.i_cat = VIDEO_ES;
1370             p_stream->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
1371         }
1372         else if( !strncmp(content_type_string, "text/x-cmml", 11) )
1373         {
1374             ogg_stream_packetout( &p_stream->os, p_oggpacket );
1375             p_stream->fmt.i_cat = SPU_ES;
1376             p_stream->fmt.i_codec = VLC_FOURCC( 'c','m','m','l' );
1377         }
1378     }
1379 }