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